tree 81e904ced86ff0d345781382171a55eb7a73bce6
parent 85f1af8f1ac60745a567d751d06890ef0089b561
parent 250e4f6dc32eb43d161f9624a5d9e8dcabefe292
author Eric Fischer <enf@google.com> 1316817591 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316817591 -0700

am 90bf4765: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit '90bf47658855c2ab0d85933d2fc7925ec3de6bf4':
  Import revised translations.  DO NOT MERGE