| commit | 441dd2b0165747aeca090ee179f0287ce9ea6052 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Mon Oct 12 12:40:19 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 12:40:19 2009 -0700 |
| tree | 7be62ab3936f4c9a67cfd5fc7e135ab330fe94ba | |
| parent | 042ad44dd88c4ce153dcc3b1c5476b2a24347a69 [diff] | |
| parent | 160028f8325e9e1face3fc6f17baef498ee3e53d [diff] |
am 160028f8: am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d' * commit '160028f8325e9e1face3fc6f17baef498ee3e53d': move recovery image to the top of the OTA package