tree a25840e1e95287f6043e7f53ad1abf051eae940a
parent aa479a56c3f521865d6ca7e79f8c5e7a4042de7b
parent c54300be1d43f670d995f689a6e0efa16a08a891
author Baligh Uddin <baligh@google.com> 1366296888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366296888 -0700

am c54300be: Import translations. DO NOT MERGE

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