Christine Franks bfb671391d resolve merge conflicts of 92f7794d90 to master ...

Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af

2017-09-19 18:24:33 -07:00

res

Merge "Import translations. DO NOT MERGE"

2017-09-19 17:52:37 +00:00

src/com/android/settings

resolve merge conflicts of 92f7794d90 to master

2017-09-19 18:24:33 -07:00

tests

resolve merge conflicts of 92f7794d90 to master

2017-09-19 18:24:33 -07:00

Android.mk

Initial search bar implementation.

2017-05-31 15:24:25 -07:00

AndroidManifest.xml

Integrate with SettingsIntelligence

2017-09-13 17:48:37 -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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%