OSDN Git Service

am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
authorDoug Zongker <dougz@android.com>
Thu, 8 Oct 2009 00:17:45 +0000 (17:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Oct 2009 00:17:45 +0000 (17:17 -0700)
commit7484d0e04a7c937a7b96e1e30a07522284e969c2
tree50610bc3b90d70b1adf5aa9511233650ca3eaba9
parentd9e435e71894d8e905bb766b983f4656e855c83b
parentf2b32f2a4b7279a92ef0870277bc99c659ee28f4
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