tree 24488cec7aa8e7e7ee9a8d62bd44a79bcb097b09
parent b6dd088a3bd8cf9855bc0212900d12da17c95486
parent c3e3cc3dee2a6a20fabbf98496ae1d9ddedc897c
author Eric Fischer <enf@google.com> 1297277531 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297277531 -0800

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

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