Matthew Fritze a504291eef resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev ...

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

2017-07-31 17:10:24 -07:00

res

Merge "Layout tweak for app action buttons" into oc-mr1-dev

2017-07-31 18:57:09 +00:00

src/com/android/settings

resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev

2017-07-31 17:10:24 -07:00

tests

Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev

2017-08-01 00:02:38 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev

2017-07-31 19:09:10 +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%