tree 7f7e31c000c122338b27efc695fe71f5b3cd454c
parent f101fd7d198036b7e9f9015c93cbf005d0771ccb
parent 3e6f65be3fabf89044182dab2d872ef58d076ee3
author Baligh Uddin <baligh@google.com> 1403552463 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403552463 +0000

am 3e6f65be: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '3e6f65be3fabf89044182dab2d872ef58d076ee3':
  Import translations. DO NOT MERGE