tree 4512bce02adae0a8fdcbc22814aeda9fd90f7b00
parent c2e2363bb3021f640c873c4071859f561db224c6
parent 7c4a9e55f0614d89c24b71811066d2b19a450efe
author Baligh Uddin <baligh@google.com> 1392411286 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411286 +0000

am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE

* commit '7c4a9e55f0614d89c24b71811066d2b19a450efe':
  Import translations. DO NOT MERGE