tree 2d5ed7ec2e04c5ff8feca6a57c47ffc8c43ef7d3
parent 541939ff48867b2a8656503d29f29eb6bf6f1a30
parent 58ffcb38828199b04a756e93a525779554efd9c9
author Jean-Baptiste Queru <jbq@google.com> 1285548134 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285548134 -0700

am 58ffcb38: reconcile froyo-release into gingerbread

Merge commit '58ffcb38828199b04a756e93a525779554efd9c9' into gingerbread-plus-aosp

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