Brad Ebinger 0f382f5656 Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev am: ab988900c4 -s ours ...

am: cfa9346d12  -s ours

Change-Id: I872ac33f426c3c43d1918b501062bd81d53b7256

2018-03-15 16:27:38 +00:00

res

Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev am: 437d421eaf

2018-03-15 16:08:16 +00:00

src/com/android/settings

Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev am: 437d421eaf

2018-03-15 16:08:16 +00:00

tests

Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev am: 437d421eaf

2018-03-15 16:08:16 +00:00

Android.mk

Disable R8 for Settings

2018-03-14 19:47:58 +01:00

AndroidManifest.xml

Merge "Fix issue #62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev am: 2dc4e36a2c

2018-03-14 04:55:52 +00:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Delete unused layout: preference_importance_slider.

2018-02-25 17:05:01 -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

Change print setting from a dynamic tile to static pref

2018-02-12 15:19:43 -08:00

proguard.flags

Instantiate pref controllers from xml if it's defined.

2018-02-23 14:08:51 -08: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%