tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent b0ca3a2935d2df5f4f9e2588f8a067c813e5330f
parent 8d5645716ca682ece87fe0e53e49b2dcce21af6f
author Eric Fischer <enf@google.com> 1302816406 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302816406 -0700

am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '4e3d6aa0688f023dfe5feb2eb197207cc8267463':
  Import revised translations.  DO NOT MERGE