tree b9047bd8b1b350d5388171bcb4e697fa1d2d5e5c
parent c8c79a654d4ae8e3a883854e19cc2df757f72d82
parent 28fe43be5c364a8f7f248a5ac05cf832a83737c2
author Hung Dang <hndang@google.com> 1279318544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279318544 -0700

am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo

Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread

* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.