OSDN Git Service

am 8a6e2c9c: Mark token strings untranslatable so they don\'t accidentally get messed up.
authorEric Fischer <enf@google.com>
Wed, 2 Dec 2009 02:30:50 +0000 (18:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 02:30:50 +0000 (18:30 -0800)
Merge commit '8a6e2c9c7682dcb69074d6e18e2006b9859abe1a' into eclair-mr2

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


Trivial merge