tree 499b3e65ac99a552e2a735e6bca318a4212536d3
parent 981c592d2a6eaf3e43a8cab274fbcb4c58b99eab
parent 9c5e49b713db3ddf12d90d8cff9c2e8191a3667d
author Baligh Uddin <baligh@google.com> 1443029126 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443029126 +0000

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

* commit '9c5e49b713db3ddf12d90d8cff9c2e8191a3667d':
  Import translations. DO NOT MERGE