Neil Fuller e01a7adf5a resolve merge conflicts of 55c0a66825 to stage-aosp-master ...

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4

2018-06-26 11:55:46 +01:00

..

accessibilityservice

Add config value for fingerprint gesture support

2018-04-20 15:53:58 -07:00

accounts

…

animation

…

annotation

…

app

resolve merge conflicts of 55c0a66825 to stage-aosp-master

2018-06-26 11:55:46 +01:00

appwidget

Add a condition in AppWidgetHost to honor config_enableAppWidgetService.

2018-04-05 22:24:14 +00:00

bluetooth

Merge "ScanRecord.getServiceData NPE fix"

2018-06-11 09:07:31 -07:00

companion

…

content

resolve merge conflicts of 55c0a66825 to stage-aosp-master

2018-06-26 11:55:46 +01:00

database

New behavior of setSynchronousMode

2018-06-01 12:11:42 -07:00

ddm

…

debug

…

gesture

…

hardware

Merge "Camera: add new detailed error callback" into pi-dev

2018-05-31 21:11:24 +00:00

inputmethodservice

Stop using unsupported Canvas operations in IME

2018-05-22 19:10:20 +00:00

metrics

…

net

Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...

2018-06-12 06:57:33 -07:00

nfc

…

os

Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"

2018-06-11 01:25:46 -07:00

permissionpresenterservice

…

preference

…

print

Allow Print subsystem to work with services provided by instant app

2018-05-10 15:26:39 -07:00

printservice

…

privacy

Merge "Add adb command to force generate network watchlist report for testing" into pi-dev

2018-03-29 00:04:26 +00:00

provider

Add configurable captive portal probes

2018-05-24 12:08:36 +09:00

se/omapi

Merge "Update the Open Mobile API version" into pi-dev

2018-05-09 18:35:47 +00:00

security

Revert "Revert "Change the root of trust for CryptAuth Vault Service""

2018-05-11 05:11:11 +00:00

service

Merged many autofill session metrics into AUTOFILL_REQUEST:

2018-05-24 09:43:27 -07:00

speech

Document system activity intents that may not be implemented

2018-05-10 17:55:26 -07:00

text

Optimise the hit test algorithm

2018-05-31 19:14:17 +01:00

transition

Don't clear focus during transition animations

2018-04-23 13:58:16 -07:00

util

Merge "Add TimestampedValue.toString()"

2018-06-14 02:40:17 -07:00

view

Merge "Move nulling of nextFrameCallback" into pi-dev

2018-06-07 22:14:51 +00:00

webkit

Update security-related WebView documentation.

2018-05-22 15:32:47 -04:00

widget

Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev

2018-06-06 18:18:27 +00:00

package.html

…