Files
app_Settings/src/com/android/settings
hughchen 4bf7c3a921 Bluetooth and NFC added back to Connection preferences
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in
  master and fix TreeHugger "Automatic merge failed" error.
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 08:03:00 +00:00
..
2018-04-20 12:52:29 -07:00
2018-04-20 12:52:29 -07:00
2018-04-20 12:52:29 -07:00
2018-04-20 12:52:29 -07:00
2018-04-20 12:52:29 -07:00
2018-04-20 12:52:29 -07:00
2018-04-20 12:52:29 -07:00
2018-04-20 12:52:29 -07:00
2018-04-15 04:22:25 +00:00
2018-04-20 12:52:29 -07:00