tree a4806fca16d22780237a4c61b14638afdd508586
parent 9fe1a25ba84ce7dace44c98c3bc8beb47bab1a4a
parent 61854931252710cedbb596918dee6524723d1223
author Baligh Uddin <baligh@google.com> 1349929116 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349929116 -0700

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

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