tree db7ea39878fec3884fbe5188da0e9ecd835712ec
parent 9b51746eeeb3009bfb585a90518168d14ed133bc
parent bef09dc022a57e535232890302ffb5e9c02b7a6a
author Eric Fischer <enf@google.com> 1302124725 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302124725 -0700

am bef09dc0: (-s ours) am ad3bddab: am 9f2f650f: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

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