tree 6d0cdeddb0ed5d9f80370d6dffc4bc1ae134acd5
parent 469ee0f81204def341d404aa64ff90cae6694924
parent 0ea55afd91b523048dfe9376c77baea447b5655f
author Baligh Uddin <baligh@google.com> 1432234060 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432234060 +0000

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

* commit '0ea55afd91b523048dfe9376c77baea447b5655f':
  Import translations. DO NOT MERGE