tree 1d31f86d6e011c440098ccd924800ccb58c42b2b
parent c8aa0b49a6aa766c905e7da516c24af1c34710e3
parent ebb17713dac153a0efdbb9ec102b8a6a99242f5f
author Baligh Uddin <baligh@google.com> 1370985003 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370985003 -0700

am ebb17713: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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