tree 4a3a3ffe8bc02f5885311b1e90d862ad20d417b1
parent dd610cac901fded167a95c8bef73220a3bc2c616
parent 7881f431f4b0a2cd75ba5bdef58de2a1fa82047f
author Baligh Uddin <baligh@google.com> 1380837830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380837830 -0700

am 7881f431: (-s ours) am e0916aec: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '7881f431f4b0a2cd75ba5bdef58de2a1fa82047f':
  Import translations. DO NOT MERGE