tree e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722
parent 2434a36da2a491fa30aa81921207d633bee508a8
parent 560a15512fbfdf0fe4801fef0c22079caf94623b
author Baligh Uddin <baligh@google.com> 1442632066 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632066 +0000

am 560a1551: (-s ours) am 78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '560a15512fbfdf0fe4801fef0c22079caf94623b':
  Import translations. DO NOT MERGE