tree 1f73d388f5b053f3afc357da49a2916f7e0ab9e7
parent ebc61fbe271954767b6913e3f75b0dc921fd638b
parent 41898f44fdc3ed435c9b264c6b88c9ae7dd5ada5
author Baligh Uddin <baligh@google.com> 1409028869 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409028869 +0000

am 41898f44: (-s ours) am 3ff6d06b: (-s ours) am 47358b6a: (-s ours) am 2637bc51: (-s ours) Import translations. DO NOT MERGE

* commit '41898f44fdc3ed435c9b264c6b88c9ae7dd5ada5':
  Import translations. DO NOT MERGE