Maurice Lam 40c22ec75a Merge "Revert choose lock header file to non-setup theme" into oc-dev ...

am: 1ecbb7d16d

Change-Id: I90b936ea2ee30f35e636b9d7aa50d5e641ca9374

2017-03-29 16:48:02 +00:00

res

Merge "Revert choose lock header file to non-setup theme" into oc-dev

2017-03-29 15:45:22 +00:00

src/com/android/settings

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

2017-03-29 13:54:02 +01:00

tests

Merge "Revert choose lock header file to non-setup theme" into oc-dev

2017-03-29 15:45:22 +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

…

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

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%