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

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 'e6b93f95f792726d52518eb5f0da5ecd1c902862':
  Import translations. DO NOT MERGE