tree d868e5db2086e4f762e440fdadb451465c3f06e3
parent 0ade43ab8c1daf4f753d33c216ef83bdc78c194d
parent f060868dd6ca8fb2f199fefd5cbb19a75ac2c108
author Eric Fischer <enf@google.com> 1319238145 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319238145 -0700

am f060868d: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit 'f060868dd6ca8fb2f199fefd5cbb19a75ac2c108':
  Import revised translations.  DO NOT MERGE