app_Settings

Go to file

Stanley Tng 0cc7d9a2af resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571

2018-10-16 15:31:00 +00: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

resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp

2018-10-16 15:31:00 +00:00

tests

resolve merge conflicts of 019a771d2d to stage-aosp-master

2018-10-15 17:30:02 -07: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

Fix color lint baseline.

2018-05-18 20:33:45 +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