tree b22a760ebfb57848b0f33c0ceeb86fc59532adbc
parent 17c9d69d7018c62d9d08ceecc6218df6704832dd
parent da8a64b80bae47fb267a5da5b321e2c03bcd3b8d
author Baligh Uddin <baligh@google.com> 1402669690 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402669690 +0000

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

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