tree 9cd528aeb893f4fa1505d5cfa4863ce936a160e2
parent a49e10747397ad6df6bb385e2ddf8ee65d75e0ed
parent 9fe1a25ba84ce7dace44c98c3bc8beb47bab1a4a
author Baligh Uddin <baligh@google.com> 1349929143 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349929143 -0700

am 9fe1a25b: (-s ours) am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

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