Nicolas Geoffray 7e1a273708 resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp ...

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

2017-05-26 11:03:19 +01:00

..

accessibilityservice

Merge "Fix accessibility button CTS test" into oc-dev

2017-05-01 19:49:13 +00:00

accounts

Update AccountManager visibility JavaDoc.

2017-05-03 09:56:09 -07:00

animation

Remove internal listener when cloning

2017-05-13 01:39:07 +00:00

annotation

Even more auto-doc work.

2017-04-24 13:20:46 -06:00

app

Merge "Correctly save retained fragments in the backstack" into oc-dev

2017-05-24 21:12:12 +00:00

appwidget

Valid resource IDs may be negative

2017-04-28 12:48:36 -07:00

bluetooth

Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b882b7

2017-05-16 20:55:37 +00:00

companion

Avoid activity leak via Companion callback

2017-05-11 13:58:28 -07:00

content

resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp

2017-05-26 11:03:19 +01:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev

2017-05-25 17:25:34 +00:00

inputmethodservice

…

metrics

expose the UID in the EventLog API

2017-04-28 11:18:07 -04:00

net

Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5 am: 1b0f4bf606

2017-05-25 01:12:51 +00:00

nfc

…

os

Merge "SelectionActionModeHelper should use target view's thread" into oc-dev

2017-05-26 01:37:50 +00:00

permissionpresenterservice

…

preference

Set icon frame to invisible when iconSpaceReserved is set.

2017-04-24 10:05:12 -07:00

print

…

printservice

…

provider

Merge "Specify behavior around DocumentsProvider#openDocument()." into oc-dev

2017-05-16 22:39:04 +00:00

security

Add device ID attestation method to keymaster

2017-04-26 17:40:44 +02:00

service

Removed deprecated APIs.

2017-05-12 10:32:45 -07:00

speech

Updates based on API council guidance.

2017-04-29 13:14:17 -06:00

text

Remove redundant TextClassificationService

2017-05-09 13:51:03 +01:00

transition

…

util

Merge "Remove time_zones_by_country.xml file" am: 3436fd4833 am: 1541ef3712

2017-05-25 11:01:07 +00:00

view

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev

2017-05-25 22:51:18 +00:00

webkit

Unbreak even more APK 26 apps running on "O" preview/beta builds.

2017-05-17 17:53:38 -06:00

widget

Merge "SelectionActionModeHelper should use target view's thread" into oc-dev

2017-05-26 00:45:42 +00:00

package.html

…