tree 94083a06190a9e2adf0150d1e11ef3addf173541
parent 6dfc94e0b2a57f95432dd2dd4e505f7d80f6b594
parent f739444694a8378142250f930bc575f9628d7ace
author Jean-Baptiste Queru <jbq@google.com> 1285549077 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285549077 -0700

am f7394446: (-s ours) am 58ffcb38: reconcile froyo-release into gingerbread

Merge commit 'f739444694a8378142250f930bc575f9628d7ace'

* commit 'f739444694a8378142250f930bc575f9628d7ace':
  Fix string placeholders that got mangled in translation.  DO NOT MERGE