tree 9180bd87001a7b156cb6c98ce9ba6d73b82154f4
parent 9eb0f42ebcf3a0ca64bbb42d41430ce7d55945d8
parent ac36d01380ada5f7d6acf3a5d55e0127edfae15f
author Baligh Uddin <baligh@google.com> 1355337140 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355337140 -0800

am ac36d013: Import translations. DO NOT MERGE

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