tree bb4e9c9f0f880b6a89314ffbc3c85316f9608e32
parent e708c5249b26978057acb9370cbfb8f6f747f5b8
parent 1396111db207abccda3f65259ece6c14e65dfe86
author Eric Fischer <enf@google.com> 1299099241 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299099241 -0800

am 1396111d: (-s ours) am 215c4424: Import revised translations.  DO NOT MERGE

* commit '1396111db207abccda3f65259ece6c14e65dfe86':
  Import revised translations.  DO NOT MERGE