Neil Fuller f53c7a2ae5 resolve merge conflicts of 7980b19bc8 to stage-aosp-master ...

am: 3147288c3b

Change-Id: Ie04ef5cd3277271304c3564ee6e41d8c24dee74c

2018-07-06 09:59:52 -07:00

..

accessibilityservice

Add config value for fingerprint gesture support

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

accounts

…

animation

Docs: fixed variables

2018-06-25 13:05:24 -07:00

annotation

…

app

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

2018-06-26 04:05:36 -07:00

appwidget

…

bluetooth

Merge "ScanRecord.getServiceData NPE fix"

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

companion

…

content

Merge "Hide system apps until installed (1/2)" into pi-dev

2018-06-26 13:19:57 -07:00

database

New behavior of setSynchronousMode

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

ddm

…

debug

…

gesture

…

hardware

Merge "Camera: Update surface sharing format restrictions" into pi-dev

2018-06-23 00:11:04 +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

…

provider

Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev

2018-06-15 22:49:30 -07: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

Merge "Fixed typo on TextValueSanitizer sample." into pi-dev

2018-06-08 17:20:27 +00:00

speech

docs: fixed typo in deprecation message

2018-06-22 15:15:32 -07:00

text

Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."

2018-06-27 08:14:58 -07:00

transition

Don't clear focus during transition animations

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

util

resolve merge conflicts of 7980b19bc8 to stage-aosp-master

2018-07-06 16:32:44 +01:00

view

Only use simple rects for cutout region

2018-07-02 17:58:10 +02:00

webkit

docs: fixed broken link

2018-06-18 14:49:23 -07:00

widget

docs: fixed broken link

2018-06-19 10:11:36 -07:00

package.html

…