tree 806b237078ba196f1245d7f6225298352580405d
parent 4a12b7f0ec9b8c77998485e69b632f166987c6c9
parent 8217e7a7aca36acb7fcf960eeadbd3c84e26408c
author Eric Fischer <enf@google.com> 1296256701 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296256701 -0800

am 8217e7a7: (-s ours) am 0360e6f5: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '8217e7a7aca36acb7fcf960eeadbd3c84e26408c':
  Import revised translations.  DO NOT MERGE