tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent a1e8ff8c039a26756b5646b576de14da94f1d152
parent 8608b1636a6cb6f53429c0bcac5beda997c49b0a
author Baligh Uddin <baligh@google.com> 1392411028 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411028 +0000

am 8608b163: (-s ours) am e02cb223: (-s ours) Import translations. DO NOT MERGE

* commit '8608b1636a6cb6f53429c0bcac5beda997c49b0a':
  Import translations. DO NOT MERGE