daqi ba3c8edc2f resolve merge conflicts of 31a2f413f8 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6

2017-06-26 15:04:15 -07:00

res

Merge "Disable managed services special access screens..."

2017-06-23 22:34:56 +00:00

src/com/android/settings

resolve merge conflicts of 31a2f413f8 to master

2017-06-26 15:04:15 -07:00

tests

Merge "Fix typo in metrics constants"

2017-06-26 21:06:48 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Disable managed services special access screens...

2017-06-23 15:44:43 -04: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%