Matthew Fritze 7f2d779e15 Merge "Remove duplicates in Security Settings" into oc-dev am: 96a8dffafb ...

am: c9f9961d8d  -s ours

Change-Id: Ia3d2431248eb95bcea9f1b95602e3ba6a2ef0171

2017-05-23 22:27:01 +00:00

res

Merge "Remove duplicates in Security Settings"

2017-05-23 19:17:28 +00:00

src/com/android/settings

Merge "Add flag for wakeup alarm"

2017-05-23 22:22:23 +00:00

tests

Merge "Add flag for wakeup alarm"

2017-05-23 22:22:23 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

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

AndroidManifest.xml

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07: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%