tree 46fcde2521016d0406c12e203472c99f5b64c57d
parent cd203770c308eb06b87c188b35eb4d6c3360811d
parent 8f301a19e6d3f6c8db9f906c7dcd86149959ccaa
author Eric Fischer <enf@google.com> 1301528415 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301528415 -0700

am b97b78fe: (-s ours) am acf48255: am 91c482b2: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

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