Takamasa Kuramitsu b496699104 Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" ...

am: b67697cf38

Change-Id: Ic1a3e5d5bd2660b8ed71b0650672321480d60adb

2019-03-01 16:29:52 -08:00

res

Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master

2019-02-23 00:39:23 +00:00

src/com/android/settings

Merge "Update the timestamp used for time zone filtering"

2019-02-27 11:01:42 -08:00

tests

DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

2019-02-21 11:03:43 -08:00

Android.mk

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

2019-03-01 21:48:55 +00:00

AndroidManifest.xml

Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master

2019-02-14 22:11:39 +00: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 11:48:56 -07:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%