tree 8503fa37d805cb6b408147eec1cfb9215b512e24
parent 2d94e3dfee7731f4ec7a620f12c8c756816e847f
parent bb36557e8e39727cd80cc8dd11e6372d4ab17175
author Eric Fischer <enf@google.com> 1322602359 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322602359 -0800

am bb36557e: (-s ours) Import revised translations.  DO NOT MERGE

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