Nicolas Geoffray 4414db2da2 Merge "resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp" into oc-dev-plus-aosp ...

am: b118505ef0

Change-Id: I6e9963188b487de4e76dc0d17d56b53050fd3745

2017-05-26 10:20:39 +00:00

..

accessibilityservice

…

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

…

app

Merge "Fix warnings surfaced by error-prone."

2017-05-25 16:44:42 +00:00

appwidget

…

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 "resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp" into oc-dev-plus-aosp

2017-05-26 10:20:39 +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

…

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

…

print

…

printservice

…

provider

Merge "Don't back up night display state settings"

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

security

…

service

Implement remaining core eUICC APIs.

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

speech

…

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

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev am: 68311f8712

2017-05-25 23:43:20 +00:00

webkit

Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev am: 997042ac33

2017-05-18 16:11:07 +00:00

widget

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

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

package.html

…