tree 1b1b3fbdc12c4a66f116992989aea57627cd4c79
parent 2c25718afd1b67eb3757abd51177503b87e7fa77
parent 3f3236e7f5491c2ab44902a42f1eae2d032446be
author Dianne Hackborn <hackbod@google.com> 1296093771 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296093771 -0800

am 3f3236e7: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '3f3236e7f5491c2ab44902a42f1eae2d032446be':
  Import revised translations.  DO NOT MERGE