Hansong Zhang f1dc08a608 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours am: acfbc0eff4 ...

am: 6197f671b2  -s ours

Change-Id: Ib3ccb0ba92d443b4cd85f4f93c24292bf3efaace

2018-05-30 14:11:13 -07:00

res

Merge "delete DeviceInfoSettings and activity, pref xml"

2018-05-30 20:14:50 +00:00

src/com/android/settings

Merge "Stop using AppState for app icon in DomainAppPreference."

2018-05-30 20:31:54 +00:00

tests

Merge "Stop using AppState for app icon in DomainAppPreference."

2018-05-30 20:31:54 +00:00

Android.mk

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

AndroidManifest.xml

Merge "delete DeviceInfoSettings and activity, pref xml"

2018-05-30 20:14:50 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Fix color lint baseline. am: 76a0ef6adb

2018-05-18 14:39:57 -07: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-04-20 12:52:29 -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%