tree f947c36fdc55ec434fa1b5663e57355f8614c54f
parent 4a02a5ccfc3363f61a1ce6fdb76008f1cdd5c41a
parent 29775794d6014196063534415ad61d60e84e9c9a
author Matthew Xie <mattx@google.com> 1340837410 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340837410 -0700

am 29775794: Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev

* commit '29775794d6014196063534415ad61d60e84e9c9a':
  Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode.