tree 4ce3215693926ab94279f50f6c8520e4f05ca1fd
parent 516a91d8acd8ee23ae0296a51c521acaa561fed3
parent e3097e689fde256ff4828271c86bfe16b4619fff
author Baligh Uddin <baligh@google.com> 1442632437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632437 +0000

am e3097e68: (-s ours) am 2f0660b4: (-s ours) Import translations. DO NOT MERGE

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