OSDN Git Service

Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b...
authorLenka Trochtova <ltrochtova@google.com>
Wed, 11 Jan 2017 15:09:46 +0000 (15:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 15:09:46 +0000 (15:09 +0000)
commitaa369e5d197f5c6d6eb43035ec78b7703e9644c1
tree6cfa353bf4a1932f8f82b9a79d0f4aad9b92b100
parent75f84f22610ddf1effb275435b189cfd5bb7e0e6
parent44a53bab4681b9793c4a6f6e78845baf9d82f849
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f
am: 44a53bab46

Change-Id: Ide191d76911c7909b2ffa6969f6d2481b1b27276
services/core/java/com/android/server/BluetoothManagerService.java