tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent a371f3ebabc175c47f240b9795eaf7fc2ceb926c
parent 861cdc99b85d0304184847493ea9be56b3449ca2
author Baligh Uddin <baligh@google.com> 1392410170 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410170 +0000

am 861cdc99: (-s ours) am 8446d354: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '861cdc99b85d0304184847493ea9be56b3449ca2':
  Import translations. DO NOT MERGE