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

am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit 'edaa63a3a7ef0c6ddf0bf1100c2a0a1df692f459':
  Import translations. DO NOT MERGE