tree 5a401e4d4c4a35178b7499b7e4bf6a5f35a8d9e8
parent d67227be8721d7ba48330ac1946700153c1a9966
parent 7eb9220a91450d42f714124fe8e2beeb632fc52d
author Eric Fischer <enf@google.com> 1320180811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320180811 +0000

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

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