Doris Ling 2ef0e15b66 [automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev ...

am: 62158f0943  -s ours

Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c

2018-08-09 15:19:19 -07: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-30 13:23:53 -07:00

tests

Fix BluetoothPairingDialogTest to not expect device name

2017-12-01 21:21:38 +00:00

Android.mk

Revert "Initial search bar implementation."

2017-06-06 17:30:17 +00:00

AndroidManifest.xml

Delete obsolete activity alias for dev settings

2018-06-27 21:53:33 -07:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -08:00

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%