Matthew Fritze 68ae06ab17 resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev am: a504291eef ...

am: 44a17e6c51

Change-Id: I59261466d74d408e75c935045984b979a4be9362

2017-08-01 00:39:55 +00: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 9feab7a8a5 to oc-mr1-dev am: a504291eef

2017-08-01 00:39:55 +00:00

tests

Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev am: 5e888ad7b6

2017-08-01 00:29:04 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7 am: 1b62cfb973" into oc-mr1-dev-plus-aosp

2017-07-31 20:22:05 +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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%