tree 485b152b97bf8321fdd223f35587bb4294672be8
parent aa8778a93e6cf2d48b8512fd1f5dfb26f00e3448
parent 82ba232b50b1bcd9221c66ebfa5fda61e10e4250
author Matthew Xie <mattx@google.com> 1326396430 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326396430 -0800

am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1

* commit '79d84930cd776c7173330eeb13b3282b6034fc37':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on