Kousuke Kitahara e008845287 [automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am: e8b70d7422 -s ours am: 7d906895e8 -s ours ...

am: 072a60c8c3  -s ours

Change-Id: I7c65b1db09429e68433fe3c781a2c04d884a53fc

2018-03-28 23:24:03 +00:00

res

Merge "Add a header view to show the country in RegionZonePicker" into pi-dev am: 05ab467e80

2018-03-28 18:01:23 +00:00

src/com/android/settings

Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev am: 00a2dcb8f9

2018-03-28 21:15:38 +00:00

tests

Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev am: 00a2dcb8f9

2018-03-28 21:15:38 +00:00

Android.mk

Enable R8 for settings

2018-03-22 21:05:11 +01:00

AndroidManifest.xml

Merge "Remove the old battery page" into pi-dev

2018-03-27 20:23:23 +00:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Make GLIF theme default for confirm lock screen

2018-03-21 18:21:04 -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

Enable R8 for settings

2018-03-22 21:05:11 +01: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%