tree 17d0baf8c628a9ac22271054077ed65ca9995922
parent 8e09310751e7d678d012b3b61b2705298b3e1b36
parent 8a6c68461821c6c3e6a08ec07e08345fdfb1b591
author Baligh Uddin <baligh@google.com> 1400728612 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400728612 +0000

am 8a6c6846: (-s ours) am d82d890e: (-s ours) Import translations. DO NOT MERGE

* commit '8a6c68461821c6c3e6a08ec07e08345fdfb1b591':
  Import translations. DO NOT MERGE