tree b9bd7513ad1fb88c9bd84e5c5834d600a2d59ce0
parent 1bdaa928ccc3caae5814fb6e9c398821c7866812
parent 1890fa822091ea700b7409ac79a57cf650b55003
author Matthew Xie <mattx@google.com> 1326396579 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326396579 -0800

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

* commit '1890fa822091ea700b7409ac79a57cf650b55003':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on