Jason Monk 769139da03 resolve merge conflicts of daeafccfa9 to master ...

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

2017-05-29 11:10:28 +02: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

Merge "Remove internal listener when cloning" into oc-dev am: a7dde34a81

2017-05-16 16:00:56 +00:00

annotation

Even more auto-doc work.

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

app

Merge "Add ResourceId validation helper method" into oc-dev am: 24c18af14a

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

appwidget

Add ResourceId validation helper method

2017-05-24 15:39:23 -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

Merge "Add ResourceId validation helper method" into oc-dev am: 24c18af14a

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

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "sensors: pass sensor handle along with injected event"

2017-05-25 21:00:24 +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 am: e8c2700519

2017-05-25 01:18:45 +00:00

nfc

…

os

Merge "SelectionActionModeHelper should use target view's thread" into oc-dev am: 58f6f428fc

2017-05-26 01:48:27 +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 "Don't back up night display state settings"

2017-05-18 16:04:37 +00:00

security

Add device ID attestation method to keymaster

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

service

Implement remaining core eUICC APIs.

2017-05-14 10:57:00 -07:00

speech

Updates based on API council guidance.

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

text

Set up empty lines for DynamicLayout#updateBlocks() tests

2017-05-23 16:18:58 -07:00

transition

…

util

Merge "MathUtils.map fix"

2017-05-26 07:26:53 +00:00

view

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

webkit

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

widget

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

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

package.html

…