tree b287276fe1b4fc73a2c3327a8836dd622a8b45b5
parent 150fbab7de7df45ce0e2d08fb0f0be87ff091c2f
parent b806823d7d004e966db8a24a9ac42e5ee2d5806d
author Eric Fischer <enf@google.com> 1285895584 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285895584 -0700

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

Merge commit 'b806823d7d004e966db8a24a9ac42e5ee2d5806d'

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