tree 6d0cdeddb0ed5d9f80370d6dffc4bc1ae134acd5
parent a2c72297387fc9e67351c98db1f514d76e3ee25f
parent 5a194cd1f573d6c94a6b0e3e14cfabd69e42b856
author Baligh Uddin <baligh@google.com> 1432215335 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432215335 +0000

am 5a194cd1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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