Fan Zhang 5c6f6949bf [automerger skipped] Merge "DO NOT MERGE Fix summary text for advanced button." ...

am: da38b41b9a  -s ours

Change-Id: I1dadf9bcd016e61ea04fe5b851e6430b1d63574d

2018-08-23 11:08:32 -07:00

res

Import translations. DO NOT MERGE

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

src/com/android/settings

Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"

2018-08-17 12:11:27 -07:00

tests

Merge "Use new SubscriptionInfo constructor"

2018-08-14 13:59:07 -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%