tree a4806fca16d22780237a4c61b14638afdd508586
parent 9870efdd359eef447709a92fef474afc04aba24a
parent ae5a2a4a4ef055fc0403b2cefa860b29ae88c998
author Baligh Uddin <baligh@google.com> 1349929019 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349929019 -0700

am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

* commit 'ae5a2a4a4ef055fc0403b2cefa860b29ae88c998':
  Revert "Import translations. DO NOT MERGE"