Salvador Martinez 34b1805053 [automerger skipped] Merge "Make it so client code does not tie tether to wifi" into pi-dev am: f005640b9c ...

am: de5cc27f0f  -s ours

Change-Id: I2b559714c89947bf38c50fbba97acdd4b1ef4dc2

2018-05-11 21:47:42 -07:00

res

Merge "Update the initial expanded count for apps and notifications." into pi-dev am: 4af11079e8

2018-05-11 17:17:47 -07:00

src/com/android/settings

Merge "Update the battery broadcast receiver."

2018-05-12 00:01:12 +00:00

tests

Merge "Update the battery broadcast receiver."

2018-05-12 00:01:12 +00:00

Android.mk

Migrate Settings to androidx.

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

AndroidManifest.xml

Merge changes Ic9d1b08c,Id6db9ce2,I7b980218

2018-05-11 20:33:10 +00:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Update color whitelist for check color repohook

2018-04-02 11:32:06 -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%