tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent bb2c462e140aef01e1244ae0a8f18714f135e540
parent e02cb2239e8dd883307af191d39c63565cf9d1e7
author Baligh Uddin <baligh@google.com> 1392410142 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410142 +0000

am e02cb223: (-s ours) Import translations. DO NOT MERGE

* commit 'e02cb2239e8dd883307af191d39c63565cf9d1e7':
  Import translations. DO NOT MERGE