jackqdyulei 7644285c2c [automerger skipped] Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev am: 205479c25d ...

am: 04e48eae76  -s ours

Change-Id: I1eb7a863a6467bc62a0234abd291ae360cdddf6c

2018-09-06 13:33:32 -07:00

res

Merge "Modify Settings homepage layout"

2018-09-06 01:15:24 +00:00

src/com/android/settings

Merge "Modify Settings homepage layout"

2018-09-06 01:15:24 +00:00

tests

Merge "Add conditional cards to the new homepage."

2018-09-05 01:50:08 +00:00

Android.mk

Migrate Settings to androidx.

2018-08-28 16:35:52 -07:00

AndroidManifest.xml

Merge "Fix the Wifi Calling back button goes to wrong screen" am: 903d2610dd am: 7c4b70c6e5

2018-08-30 16:07:40 -07:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Modify Settings homepage layout

2018-09-05 11:55:16 +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%