commit | bbb01553372167f6ee5907dbda318772207aa3ed | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Dec 01 18:41:51 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 01 18:41:51 2009 -0800 |
tree | 6c936a0f807287fe1306c53de7438849fcd15ad8 | |
parent | 330d888831777b0095339603b862fd59dbfacb05 [diff] | |
parent | 7d04ef2afa37c20f9bd72dc8f3bd8929e148f62f [diff] |
am 7d04ef2a: am 8a6e2c9c: Mark token strings untranslatable so they don\'t accidentally get messed up. Merge commit '7d04ef2afa37c20f9bd72dc8f3bd8929e148f62f' * commit '7d04ef2afa37c20f9bd72dc8f3bd8929e148f62f': Mark token strings untranslatable so they don't accidentally get messed up.