OSDN Git Service

am 9fe1a25b: (-s ours) am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE...
authorBaligh Uddin <baligh@google.com>
Thu, 11 Oct 2012 04:19:03 +0000 (21:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 04:19:03 +0000 (21:19 -0700)
commite221a3f2b664ac70ea6e2563049708531600d13b
tree9cd528aeb893f4fa1505d5cfa4863ce936a160e2
parenta49e10747397ad6df6bb385e2ddf8ee65d75e0ed
parent9fe1a25ba84ce7dace44c98c3bc8beb47bab1a4a
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"