app_Settings

Go to file

TreeHugger Robot 197a10b053 Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
  DO NOT MERGE Disable changing lock when device is not provisioned.

2018-08-09 18:43:34 +00:00

res

Merge translations of Bluetooth confirmation text

2018-06-04 18:05:34 +00:00

src/com/android/settings

DO NOT MERGE Give PBAP permission only after user confirms

2018-05-18 17:31:42 -07:00

tests

Fix BluetoothPairingDialogTest to not expect device name

2017-11-15 18:38:36 +00:00

Android.mk

Revert "Initial search bar implementation."