Alison Cichowlas 59b4e5b6c4 Merge "If two groups are posted to settings, remove old group and log." into oc-dev ...

am: 9fa5e66a66

Change-Id: Iafb44eeb33fc626633ed885a2a18ed1cbe95ee48

2017-06-06 23:57:05 +00:00

res

Merge "Make icons colorful for Security settings." into oc-dev

2017-06-06 23:56:36 +00:00

src/com/android/settings

Merge "If two groups are posted to settings, remove old group and log." into oc-dev

2017-06-06 23:57:05 +00:00

tests

Merge "Wifi details: minor ordering fixes." into oc-dev

2017-06-06 22:35:42 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Merge "Revert "Add search bar to SearchActivity."" into oc-dev

2017-06-06 18:42:25 +00: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%