tree edf6a31101b430f42b2a6afa3cac39c569a864e7
parent 10a8f7db92efbf9d70fe8015501d0e679ea1428c
parent 3db07a0fe40745ec3d5ffe1348e2390b042b335d
author Eric Fischer <enf@google.com> 1295416536 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295416536 -0800

am 3db07a0f: (-s ours) am 2986910b: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '3db07a0fe40745ec3d5ffe1348e2390b042b335d':
  Import revised translations.  DO NOT MERGE