Jeff Sharkey 0a121334b2 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064 am: 8bdd94e292 ...

am: f70906f2da  -s ours

Change-Id: I13c9c64d607d6ab5a4358786c3974c1920a4e679

2017-10-11 21:53:47 +00:00

res

Merge "Import translations. DO NOT MERGE"

2017-10-11 21:31:08 +00:00

src/com/android/settings

Merge "Introduce SimulateColorSpacePreferenceController"

2017-10-11 20:05:00 +00:00

tests

Merge "Introduce SimulateColorSpacePreferenceController"

2017-10-11 20:05:00 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

2017-09-26 01:18:50 +00:00

AndroidManifest.xml

Remove DevelopmentTileConfigActivity and clean up fragment.

2017-10-10 12:12:19 -07:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Hook up lint color check to settings

2017-09-15 11:45:21 -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

OWNERS

Add OWNERS file for settings

2017-09-12 13:10:08 -07:00

PREUPLOAD.cfg

Enable the color lint check

2017-09-18 17:01:23 -07: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%