tree c851908633f0d5accee900ca3da50fa21f12c9fe
parent 390d9cddc3b698f2fbf3822ddaf01453d8131ae4
parent a14935b44b6d67c91af4cf54e314524e9c12e0bc
author Baligh Uddin <baligh@google.com> 1442633115 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442633115 +0000

am 26fdc830: (-s ours) am 94d8b53e: (-s ours) am 7bfb8135: (-s ours) Import translations. DO NOT MERGE

* commit '26fdc83028d2ca1a1a2035da2300b54ebd688184':
  Import translations. DO NOT MERGE