tree 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d
parent 0763101a0920575737efab126d56c1eda091b09e
parent 008f8f0da55a59268bfc4dbe1ef2dbe49c2db3d4
author Baligh Uddin <baligh@google.com> 1442631359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631359 +0000

am 008f8f0d: (-s ours) am e924107c: (-s ours) Import translations. DO NOT MERGE

* commit '008f8f0da55a59268bfc4dbe1ef2dbe49c2db3d4':
  Import translations. DO NOT MERGE