tree b8542c15784ecb74ca84b20ef2813fddd1643a6e
parent fc47b77e0561735486c493127e2607a7719381a7
parent 5c3ea10c7ba46e33284ceb4d363e4a304dabc131
author Baligh Uddin <baligh@google.com> 1442632715 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632715 +0000

am 5c3ea10c: (-s ours) am 331c3ec7: (-s ours) am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '5c3ea10c7ba46e33284ceb4d363e4a304dabc131':
  Import translations. DO NOT MERGE