Phil Weaver c0f77c7e6f resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours am: 8d9e305d84 -s ours ...

am: 60a0a021d1  -s ours

Change-Id: Ic5166d81882bcb5b03cdd6ee072dc7855b40e3aa

2017-08-31 19:08:18 +00:00

res

Misc icon updates am: 24dc1ab39e

2017-08-31 04:44:02 +00:00

src/com/android/settings

Merge "Tint the work icon." into oc-mr1-dev am: 260ec8b9ea

2017-08-31 18:19:33 +00:00

tests

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

2017-08-30 17:21:30 +00:00

Android.mk

Initial search bar implementation.

2017-05-31 15:24:25 -07:00

AndroidManifest.xml

Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am: 0dc85bcc1e

2017-08-10 02:31:39 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

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%