app_Settings

Go to file

Wei Wang 41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

2014-03-19 22:37:27 -07:00

res

DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

2014-03-19 22:37:27 -07:00

src/com/android/settings

DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

2014-03-19 22:37:27 -07:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

The Settings app needs privileged permissions