OSDN Git Service

Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382
authorltrochtova <ltrochtova@google.com>
Thu, 26 Jan 2017 09:53:23 +0000 (09:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 09:53:23 +0000 (09:53 +0000)
commit3db1ff462ab9394bef1e0a2e0904fa47fcb330f4
tree33e8f33c52e0a9ff074d46c0607cef153ed80739
parent44cafbb018fbad5d4f859e6ab7e95a66d4db0a3b
parentc0118ac10ed692e129b88c1709496965a5693d27
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382
am: c0118ac10e

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