tree 9f9bda762dac9a377a0467e61d810866ef471a9d
parent 00c78c238316d0abcc12133c5d4b87685395639a
parent e4a2c2e37f94050499f5b5411980fac4d074cce1
author Baligh Uddin <baligh@google.com> 1353117281 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353117281 -0800

am e4a2c2e3: (-s ours) am 8b658253: am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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