Andre Eisenbach de40f47147 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7 am: e81838f7e1 ...

am: efb1bda2d6

Change-Id: I8144d1e2c856304982679c35faa401f0aad5478f

2017-01-12 17:30:55 +00:00

..

java/com/android/server

Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7 am: e81838f7e1

2017-01-12 17:30:55 +00:00

jni

resolve merge conflicts of ec7e2a164c to master

2017-01-12 08:28:30 -08:00

Android.mk

resolve merge conflicts of 46c39f6c36 to master

2017-01-11 16:15:13 +00:00