Salvador Martinez fbdc2f2e5e resolve merge conflicts of 42d0815115 to master ...

Change-Id: I949e09de6aade8d07857a2b8d4bd34a549795939

Bug: None
Test: I solemnly swear I tested this conflict resolution

2018-04-20 18:10:13 -07:00

res

Merge "Add a default title for data_management pref."

2018-04-20 22:27:03 +00:00

src/com/android/settings

resolve merge conflicts of 42d0815115 to master

2018-04-20 18:10:13 -07:00

tests

resolve merge conflicts of 42d0815115 to master

2018-04-20 18:10:13 -07:00

Android.mk

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

AndroidManifest.xml

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Update color whitelist for check color repohook

2018-04-02 11:32:06 -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

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Migrate Settings to androidx.

2018-04-20 12:52:29 -07: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%