tree bcdbc5e0112c3596fbdcbca54dae750d5dba0650
parent 20db55e836a97f04c73e4bf9ea4e0290a8ab6ed8
parent 9e2783ee9feeefed644d5524d036ee4cbcb264f4
author Baligh Uddin <baligh@google.com> 1354051810 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354051810 -0800

am 9e2783ee: am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '9e2783ee9feeefed644d5524d036ee4cbcb264f4':
  Import translations. DO NOT MERGE