OSDN Git Service

am 160028f8: am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
authorDoug Zongker <dougz@android.com>
Mon, 12 Oct 2009 19:40:19 +0000 (12:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2009 19:40:19 +0000 (12:40 -0700)
commit441dd2b0165747aeca090ee179f0287ce9ea6052
tree7be62ab3936f4c9a67cfd5fc7e135ab330fe94ba
parent042ad44dd88c4ce153dcc3b1c5476b2a24347a69
parent160028f8325e9e1face3fc6f17baef498ee3e53d
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