Robin Lee 27ae2bb1fe resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp ...

Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9

2017-03-29 13:54:02 +01:00

res

Merge "Set flagForceAscii for device password entries" into oc-dev

2017-03-28 23:21:02 +00:00

src/com/android/settings

resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp

2017-03-29 13:54:02 +01:00

tests

Revert "Convert BT preference to use TwoTargetPreference"

2017-03-28 20:03:10 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

2016-12-16 14:11:02 -08:00

AndroidManifest.xml

Move automatic rules to main DND settings page.

2017-03-27 15:57:39 -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%