Android Build Merger (Role) dd802f7c3c [automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev am: 2ffa711cd1 -s ours skipped: 3a5859779a ...

Change-Id: I7bfd420524778f682d1836ca21c49361e5330ae7

2018-06-13 21:36:42 +00:00

res

Merge "Add padding between battery text and icon"

2018-06-12 23:32:26 +00:00

src/com/android/settings

Merge "Fix back stack didn't perserved when Files Activity launched by Setting storage then back case."

2018-06-13 18:10:24 +00:00

tests

Merge "Fix back stack didn't perserved when Files Activity launched by Setting storage then back case."

2018-06-13 18:10:24 +00:00

Android.mk

Migrate Settings to androidx.

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

AndroidManifest.xml

Remove DataSummaryUsageLegacy.

2018-06-11 11:05:54 -07:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Fix color lint baseline. am: 76a0ef6adb

2018-05-18 14:39:57 -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%