tree 1667bfddf1ed05198cb0fec8d5d75011a260fe04
parent 845b6532b09d4aecb34baa1be66eb53893453c64
parent 691976fae6ff7ef925e411e9e7b273d2623072bf
author Matthew Xie <mattx@google.com> 1340837587 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340837587 -0700

am 691976fa: 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 '691976fae6ff7ef925e411e9e7b273d2623072bf':
  Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode.