tree 9ef5173a03a9333a34ad410b6a4767a099fe48da
parent 82f10acfbac51eeefcaf2cdf1bd4263f5c367d05
parent bdfc17cedc170c51dacf17e26e853a6275516d37
author Baligh Uddin <baligh@google.com> 1408729440 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408729440 +0000

am bdfc17ce: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

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