Matthew Fritze a35320ce3b Add INTENT_ONLY as a ResultPayload Availibility ...

Manual merge after a merge conflict.

Test: robotests
Bug: 64165583
Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75

2017-08-04 11:49:24 -07:00

res

Merge "In the “Data usage” subtext, remove the word “between”." into oc-mr1-dev

2017-08-04 03:05:21 +00:00

src/com/android/settings

Add INTENT_ONLY as a ResultPayload Availibility

2017-08-04 11:49:24 -07:00

tests

Add 'clear' button to pin/password lock screen

2017-08-03 17:46:51 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev

2017-08-04 04:11:42 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

PREUPLOAD.cfg

…

proguard.flags

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%