Xin Li 601dd7f647 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." ...

am: d5ce2c2afc -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4eb5c4bbd9a841279826081f8d714d8c24cbf5b

2019-05-09 19:05:15 -07:00

res

Merge "Adding new strings needed for Enable MMS toggle."

2019-05-01 14:58:44 -07:00

src/com/android/settings

Merge "Ignore the outdated entitlement check"

2019-04-19 20:26:15 -07:00

tests

Merge "Ignore the outdated entitlement check"

2019-04-19 20:26:15 -07:00

Android.mk

Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""

2019-03-02 01:52:04 +00:00

AndroidManifest.xml

Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED.

2019-04-08 12:52:04 -07:00

CleanSpec.mk

Move Settings app to /product

2019-01-11 16:41:54 +00:00

color-check-baseline.xml

Update color-check-baseline.xml

2018-12-21 14:20:01 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

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-08-28 16:35:52 -07:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%