Jan Nordqvist f957c64367 [automerger skipped] Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev am: 220a6a002e ...

am: d19ca38ebb  -s ours

Change-Id: I763e60a281843dd7766b9aff582ca117565931a7

2018-04-05 13:22:52 -07:00

res

Merge "Fall back to Wi-Fi data display in data usage screen with no SIM."

2018-04-05 18:07:17 +00:00

src/com/android/settings

Merge "Couple more Scoped Directory Access changes." into pi-dev am: 963a4fb59e

2018-04-05 13:12:03 -07:00

tests

Merge "Show Battery saver tip when battery saver is on" into pi-dev am: 197be04330

2018-04-05 11:49:04 -07:00

Android.mk

Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08

2018-04-04 16:45:09 -07:00

AndroidManifest.xml

Updates to match prebuilts drop

2018-04-04 16:08:17 -04: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

Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08

2018-04-04 16:45:09 -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%