tree cfef33f89388008bd4f477d76e8387a3269fca1a
parent 495c18323ae38817373abfbdd2db66fe1c5bdf71
parent 9ce55768ddfd957302f2af2163df02d9451d2056
author Dianne Hackborn <hackbod@google.com> 1296097882 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296097882 -0800

am 9ce55768: (-s ours) am 3f3236e7: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '9ce55768ddfd957302f2af2163df02d9451d2056':
  Import revised translations.  DO NOT MERGE