tree eab5a7baca0b1379d0e744ab612002fad6e82ba7
parent 91ed3d47f2f2ac1f9dce9ed69a5968e4b9de24d2
parent 0360e6f5ff06f34634246fa7ce38ad5e4e8222f4
author Eric Fischer <enf@google.com> 1296256412 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296256412 -0800

am 0360e6f5: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '0360e6f5ff06f34634246fa7ce38ad5e4e8222f4':
  Import revised translations.  DO NOT MERGE