Xin Li 2c2f179630 [automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master ...

am: 2d744bd9e1  -s ours

Change-Id: Ia5bc1d228449c6f78d54f25c392b3ea33c80ddef

2018-12-11 15:54:17 -08:00

res

Merge "Display a toast to notify user that Preset APN setting cannot be viewed" am: a995cb334b

2018-11-26 13:51:57 -08:00

src/com/android/settings

Merge "Revert "Schematize vold system properties"" am: 94ef16b6e3

2018-12-07 04:38:25 -08:00

tests

Merge "Make migrate option menu invisible when src volume is not mounted" am: 6db9f21256

2018-12-04 10:10:50 -08:00

Android.mk

Remove explicit dependency on bouncycastle

2018-10-11 17:02:36 +01:00

AndroidManifest.xml

Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev

2018-11-12 17:39:43 -08:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Move "About Phone" to bottom of Settings main IA, above "Tips & Support"

2018-11-09 11:24:48 +08: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-08-28 16:35:52 -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%