app_Settings

Go to file

Lei Yu e81224d80c resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp

Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389

2018-10-25 14:25:21 -07:00

res

Import translations. DO NOT MERGE

2018-10-17 04:32:19 +00:00

src/com/android/settings

resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp

2018-10-25 14:25:21 -07:00

tests

resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp

2018-10-25 14:25:21 -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

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