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)
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package


Trivial merge