tree 30da494da913fb2644b72796db6fe6e4629d5284
parent 692dfafe02d04cdbab5367546e166580c92e4d2e
parent 4318ab058629b701e225bb7ead9dd2b229c9354b
author Eric Fischer <enf@google.com> 1285351507 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285351507 -0700

am 4318ab05: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit '4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp

* commit '4318ab058629b701e225bb7ead9dd2b229c9354b':
  Import revised translations.  DO NOT MERGE