tree bc0224849282269b24f61271881bba4b46ce5369
parent 588cf90aa37acc1b17730f3590aa46d3f30b1603
parent 986c267bd035edff4b457a002b4e2010bc8a78da
author Baligh Uddin <baligh@google.com> 1404675594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404675594 +0000

am 986c267b: (-s ours) am 235e727e: (-s ours) Import translations. DO NOT MERGE

* commit '986c267bd035edff4b457a002b4e2010bc8a78da':
  Import translations. DO NOT MERGE