Bill Yi 816e75fbc3 [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b16aba0dd -s ours ...

am: 27e14db009  -s ours

Change-Id: Ic2e8292d1f5936b943ba084611456fcf19651004

2018-10-24 18:53:10 -07:00

res

Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a

2018-10-15 10:59:04 -07:00

src/com/android/settings

Merge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44

2018-10-23 19:30:39 -07:00

tests

resolve merge conflicts of b0e99e1472 to stage-aosp-master

2018-10-17 18:14:27 +00:00

Android.mk

Remove explicit dependency on bouncycastle

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

AndroidManifest.xml

Clean up task affinity.

2018-09-26 15:23:11 -07:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

DO NOT MERGE Fix color_lint errors

2018-08-28 17:18:49 +00: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%