tree cba62d0d64153aa2169651696bc238591341d679
parent c393f3dd393b73639b59c874f94086e21cb476c1
parent 7c3fe3947d3c52a06d34f7b9e23cbc9c14fb8b32
author Baligh Uddin <baligh@google.com> 1414085451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085451 +0000

am 7c3fe394: (-s ours) am e6b93f95: (-s ours) am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf

* commit '7c3fe3947d3c52a06d34f7b9e23cbc9c14fb8b32':