tree 2573efb0c6cc4acb58ff5179ffa43c6408e82d4b
parent 7b9ab8225217fe371400698a8f5685e7e95491ab
parent 252044e5e067367ac5cd1c75afcb2fcafeedde64
author Baligh Uddin <baligh@google.com> 1443207544 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443207544 +0000

am 252044e5: (-s ours) am 8403b9b7: (-s ours) am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '252044e5e067367ac5cd1c75afcb2fcafeedde64':
  Import translations. DO NOT MERGE