tree 511345417f12ff2b6e58cb9a26fdcb0597cd111d
parent ca931dd2e8f09a5618cdd84fc9daf81da32b5177
parent fc223d969b62e5269351cabede7f10738d643e24
author Eric Fischer <enf@google.com> 1286726816 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286726816 -0700

am fc223d96: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'fc223d969b62e5269351cabede7f10738d643e24'

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