tree dd78af5468f1c36e63a4d6459daeb646a6fc8f1e
parent c1c3c529a38a829c0f9829aa60d2163661d8782b
parent a04bfb78abe36c1611c04320918ff5820bb20e46
author Baligh Uddin <baligh@google.com> 1441992325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441992325 +0000

am a04bfb78: (-s ours) am c0746b02: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'a04bfb78abe36c1611c04320918ff5820bb20e46':
  Import translations. DO NOT MERGE