tree a3f06201126db5edde4082ad8325b3addc3be62d
parent 7171f5b7d16e9a0c861cc249188864385877077f
parent b42e83b1eccfd1fa1e02cd0c30edfc06e05de995
author Eric Fischer <enf@google.com> 1301432834 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301432834 -0700

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

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