tree c3918da892700e5aba0effde439400e370c46a31
parent e934f87c6adc29c84ea96c608db4e4e5dd6b4046
parent 999095a29c4bada97251e33d9f95346207253130
author Eric Fischer <enf@google.com> 1307036538 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307036538 -0700

am 999095a2: (-s ours) am 5bce03e3: am 2c30c859: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr2

* commit '999095a29c4bada97251e33d9f95346207253130':
  Import revised translations.  DO NOT MERGE