commit | 160028f8325e9e1face3fc6f17baef498ee3e53d | [log] [tgz] |
---|---|---|
author | Doug Zongker <dougz@android.com> | Wed Oct 07 17:19:28 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 17:19:28 2009 -0700 |
tree | c09cbbf6c872a776b06c274f81f212a8c710745d | |
parent | ce017f01d006d3e953f3a38f9489360ecd5d0695 [diff] | |
parent | f2b32f2a4b7279a92ef0870277bc99c659ee28f4 [diff] |
am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2 * commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4': move recovery image to the top of the OTA package