Chalard Jean e2f74af063 Merge "Support VPN Proxy(2/2)" ...

am: 2a695c4b7b

Change-Id: I58553c28c8f4e87a52169f925da70c2edb89ca71

2019-03-08 06:42:57 -08:00

res

Merge "Support VPN Proxy(2/2)"

2019-03-08 06:42:57 -08:00

src/com/android/settings

Merge "Support VPN Proxy(2/2)"

2019-03-08 06:42:57 -08:00

tests

Merge "WFC roaming mode setting can not be used with a fixed value"

2019-03-08 06:08:40 -08:00

Android.mk

Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""

2019-03-02 01:52:04 +00:00

AndroidManifest.xml

Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master

2019-02-14 22:11:39 +00:00

CleanSpec.mk

Move Settings app to /product

2019-01-11 16:41:54 +00:00

color-check-baseline.xml

Update color-check-baseline.xml

2018-12-21 14:20:01 -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%