tree b1463ab1fd1b2a557cfd08ef289bff12f87570ae
parent 76565cdb39fba3d5485c74ab721c92e63387cb91
parent ed298a3b5de42f14f294f6c09afd1eeda8e5fcc2
author Baligh Uddin <baligh@google.com> 1412024426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412024426 +0000

am ed298a3b: (-s ours) am 37327a1f: (-s ours) Import translations. DO NOT MERGE

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