tree e89d7da53d68fc04a0340dbd8ca9ba2daad2285d
parent 1b3000268c9c5024d4a42844b0bd29e3240c7a68
parent b655d545b7a3f33ac84381c77c649ec9b6197ab4
author Eric Fischer <enf@google.com> 1321469739 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321469739 -0800

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

* commit 'b655d545b7a3f33ac84381c77c649ec9b6197ab4':
  Import revised translations.  DO NOT MERGE