Xin Li 55ce535126 Merge stage-dr1-aosp-master into stage-aosp-master ...

am: fbc7d27155

Change-Id: I02a6acca4f15b665cf5b5f3f19d1df07b65264cb

2018-08-13 17:36:58 -07:00

res

Import translations. DO NOT MERGE

2018-08-04 07:43:29 -07:00

src/com/android/settings

Disable changing lock when device is not provisioned.

2018-08-09 11:58:38 -07:00

tests

Disable changing lock when device is not provisioned.

2018-08-09 11:58:38 -07:00

Android.mk

Updates to match prebuilts drop

2018-04-04 16:08:17 -04:00

AndroidManifest.xml

Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a

2018-08-09 16:31:49 -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

Updates to match prebuilts drop

2018-04-04 16:08:17 -04: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%