tree 8853a0beca525de811333d2127efd369bb3e0e09
parent 3640e476eaa712c20b62d97660c30e2b08a79f2e
parent f40c089612727656584dbb1560cd9dc18bb02cfa
author Baligh Uddin <baligh@google.com> 1410886248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410886248 +0000

am f40c0896: (-s ours) am 2790a98c: (-s ours) Import translations. DO NOT MERGE

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