tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 3c1818c32bc9953db2b31edb31f53c7cdfddc4b3
parent 88485bb5d086e66248fed3246681703860c16a8f
author Baligh Uddin <baligh@google.com> 1392411662 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411662 +0000

am 88485bb5: (-s ours) am 78c7429c: (-s ours) am 0cc0c216: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '88485bb5d086e66248fed3246681703860c16a8f':
  Import translations. DO NOT MERGE