tree ab67fa053999f574df4b944131d37609f331db41
parent 1ce5ca8c7fbc56ae05fa934ada27bbf4e5392f1c
parent 7eb9220a91450d42f714124fe8e2beeb632fc52d
author Eric Fischer <enf@google.com> 1320255087 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320255087 +0000

am 7eb9220a: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '7eb9220a91450d42f714124fe8e2beeb632fc52d':
  Import revised translations.  DO NOT MERGE