tree 9a3387bc89bac570d769917d77bf1bea2d4bc953
parent 88096d649a2d7d4fec3d0defbb1b9cde5d3d156a
parent 0a2a2ed1728ed3fb6865766bea6093886dd71278
author Baligh Uddin <baligh@google.com> 1411414363 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411414363 +0000

am 961c338d: (-s ours) am 4117cf1c: (-s ours) am fc3eea68: (-s ours) Import translations. DO NOT MERGE

* commit '961c338d27d883dc778c6b3b3f71d20e63e185d1':
  Import translations. DO NOT MERGE