app_Settings

Go to file

Stanley Tng 81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953

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

res

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

2018-10-15 10:42:52 -07:00

src/com/android/settings

resolve merge conflicts of b0e99e1472 to stage-aosp-master

2018-10-17 18:14:27 +00: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

Merge "Fix the Wifi Calling back button goes to wrong screen"

2018-08-30 15:28:44 -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

…

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00