tree 5e14ca8d991092e9e9497a874a44c83d270cd36d
parent 0e4a73f8113071db0f66f77f66ab1331ac6af9b8
parent 5c4c1eac50ae86344c8f6a9cecf4e6fc436f3a21
author Baligh Uddin <baligh@google.com> 1355203737 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355203737 -0800

am 5c4c1eac: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '5c4c1eac50ae86344c8f6a9cecf4e6fc436f3a21':
  Import translations. DO NOT MERGE