OSDN Git Service

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