tree 6c936a0f807287fe1306c53de7438849fcd15ad8
parent bcf1351faefa60cd726b0faad8d816d2beef0b53
parent 8a6e2c9c7682dcb69074d6e18e2006b9859abe1a
author Eric Fischer <enf@google.com> 1259721050 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259721050 -0800

am 8a6e2c9c: Mark token strings untranslatable so they don\'t accidentally get messed up.

Merge commit '8a6e2c9c7682dcb69074d6e18e2006b9859abe1a' into eclair-mr2

* commit '8a6e2c9c7682dcb69074d6e18e2006b9859abe1a':
  Mark token strings untranslatable so they don't accidentally get messed up.