Phil Weaver d88b7364d8 resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 ...

am: f8a7b8aff0  -s ours

Change-Id: I2430a1e15414366ba054c5d67a31c01e0b3b9725

2017-08-31 17:37:09 +00:00

res

Misc icon updates

2017-08-31 03:24:36 +00:00

src/com/android/settings

Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev

2017-08-31 04:25:28 +00:00

tests

Merge "Add device/profile app check in background check" into oc-mr1-dev

2017-08-30 17:15:02 +00:00

Android.mk

Revert "Initial search bar implementation."

2017-06-06 17:30:17 +00:00

AndroidManifest.xml

Update icon and string for new device intro suggestion

2017-08-09 13:57:37 -07:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -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

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -08:00

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00: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%