| commit | 003736851fb837c783db7ee2ae8f80b0fc836b5c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Sep 26 17:57:57 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 26 17:57:57 2010 -0700 |
| tree | 94083a06190a9e2adf0150d1e11ef3addf173541 | |
| parent | 6dfc94e0b2a57f95432dd2dd4e505f7d80f6b594 [diff] | |
| parent | f739444694a8378142250f930bc575f9628d7ace [diff] |
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