Robin Lee e21ec8bbf6 resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp ...

am: 27ae2bb1fe

Change-Id: Ie1e53aa15cffef5f0e99f1601f9bab42dfe1e386

2017-03-29 13:16:37 +00:00

res

Merge "Add DEFERRED_SETUP as exclusive suggestion"

2017-03-29 01:25:22 +00:00

src/com/android/settings

resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp

2017-03-29 13:16:37 +00:00

tests

Merge "Use buttons for EncryptionInterstitial"

2017-03-28 23:11:41 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

2016-12-16 14:11:02 -08:00

AndroidManifest.xml

Move automatic rules to main DND settings page.

2017-03-27 15:57:39 -04: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%