tree 33b9ce7cfcae13164f6a0aada576b84c54b34296
parent 708dc5c76cfebeb9f247c407445402ac50e3429e
parent f2d9969fdd8f1e3c125dd3607fc7cb5d3a8a8334
author Baligh Uddin <baligh@google.com> 1409004436 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409004436 +0000

am 932a8ca3: (-s ours) am 26608149: (-s ours) Import translations. DO NOT MERGE

* commit '932a8ca348060ea2ff4ef81782e412b94a47fd8a':
  Import translations. DO NOT MERGE