tree 8a980b3da908c42c774159d74c4f048d42737e76
parent 9c6fbed48783dacd9bc6b4ec5f2cc8e59ec7ee37
parent 7897afa85b6242f1e1930bfe2fab8b0874298e65
author Eric Fischer <enf@google.com> 1299133614 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299133614 -0800

am 7897afa8: (-s ours) am fc154399: Import revised translations.  DO NOT MERGE

* commit '7897afa85b6242f1e1930bfe2fab8b0874298e65':
  Import revised translations.  DO NOT MERGE