tree 9cd528aeb893f4fa1505d5cfa4863ce936a160e2
parent e221a3f2b664ac70ea6e2563049708531600d13b
parent eddbe4e9946b1175f4549617abc4b792e778ac4a
author Baligh Uddin <baligh@google.com> 1349929228 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349929228 -0700

am eddbe4e9: (-s ours) am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

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