tree c5bf653c619146e8824a565465cc54c0cf7d401e
parent 9da2a5de25420c7a4b4f1598ece16b5d5796d81f
parent a14b513ce84e72eaa493bbf7843a0542d43f6262
author Eric Fischer <enf@google.com> 1302818681 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302818681 -0700

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

* commit '1bfb2db93514f8ed70d0a02c12d7ce4791d6b336':
  Import revised translations.  DO NOT MERGE