tree 8addc1043e3e513851bab44dd068a24c363508f9
parent af08ec645740f2361e2e534f6345c06427ca51c2
parent e461dc6ffe0cf1fdd70bb855303418fc343a857b
author Eric Fischer <enf@google.com> 1253563875 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253563875 -0700

am e461dc6f: Armor string format tokens with translation placeholders.

Merge commit 'e461dc6ffe0cf1fdd70bb855303418fc343a857b'

* commit 'e461dc6ffe0cf1fdd70bb855303418fc343a857b':
  Armor string format tokens with translation placeholders.