Fan Zhang 1f1fa944db Merge "Show setting for work profile lock screen notification" into oc-dev am: 5bb87f9f34 ...

am: e8e23081fa  -s ours

Change-Id: Ie872c59887b02dedd73a89a024049226f87496ce

2017-05-25 23:27:58 +00:00

res

Merge "Show setting for work profile lock screen notification"

2017-05-25 20:37:50 +00:00

src/com/android/settings

Merge "Add logging to default browser preference controller"

2017-05-25 21:27:23 +00:00

tests

Merge "Show setting for work profile lock screen notification"

2017-05-25 20:37:50 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

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

AndroidManifest.xml

Merge "Update intent priority for AdvancedAppsActivity."

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

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%