tree 1e970797a71f55c42dd3b5b306921e45475ac63d
parent 0d430593ee07b78894eff8b78f559d2591a94287
parent cfce0aa58bd5b8ccdd29a6d78b04786eed75c374
author Android (Google) Code Review <android-gerrit@google.com> 1251481709 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1251481709 -0700

Merge change 23023 into eclair

* changes:
  Armor string format tokens with translation placeholders.