Matthew Fritze 57b641eee8 resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp ...

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

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

res

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

2017-07-31 19:27:13 +00:00

src/com/android/settings

resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp

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

tests

Merge "Use package from sipper if default is null" into oc-dr1-dev

2017-07-31 23:49:07 +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 am: 9064072ed7

2017-07-31 19:28:28 +00:00

CleanSpec.mk

…

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

…

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%