| commit | 7484d0e04a7c937a7b96e1e30a07522284e969c2 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Wed Oct 07 17:17:45 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 17:17:45 2009 -0700 |
| tree | 50610bc3b90d70b1adf5aa9511233650ca3eaba9 | |
| parent | d9e435e71894d8e905bb766b983f4656e855c83b [diff] | |
| parent | f2b32f2a4b7279a92ef0870277bc99c659ee28f4 [diff] |
am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp * commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4': move recovery image to the top of the OTA package