am bc12cd04: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 22:54:09 +0000 (15:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 May 2010 22:54:09 +0000 (15:54 -0700)
commit57b44e528741357c02844c4f85b4f58f547979ce
treefd729894c104bc8b0d7d195fd0c5ad3cfcedd7e7
parent216d8448a04f3c7794d1e4ec1178a2bf6da2ba95
parentbc12cd04b878a9c3520abd21600c2078c930adc3
am bc12cd04: merge from open-source master

Merge commit 'bc12cd04b878a9c3520abd21600c2078c930adc3' into kraken

* commit 'bc12cd04b878a9c3520abd21600c2078c930adc3':
  Use a different kernel boot line for the disk installer.
  Use a property to enable the eth0 LAN port on the emulator