tree a4806fca16d22780237a4c61b14638afdd508586
parent ae5a2a4a4ef055fc0403b2cefa860b29ae88c998
parent 260eb9c6ff598d792b51e5c24608602a1f5b1504
author Baligh Uddin <baligh@google.com> 1349929014 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349929014 -0700

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

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