Mathew Inwood a5191dacdc resolve merge conflicts of 2ee069f73d to stage-aosp-master ...

am: 8b62717128

Change-Id: Ib32e90ab073d32cc1354c2a3e889ebca813c59f1

2018-08-17 01:43:27 -07:00

..

accessibilityservice

Merge "docs: Added units for AccessibilityServiceInfo#notificationTimeout." into pi-dev

2018-08-15 13:16:57 -07:00

accounts

Merge "Add @UnsupportedAppUsage annotations"

2018-08-09 13:58:15 +00:00

animation

Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90

2018-08-03 04:29:45 -07:00

annotation

Merge "Add annotation for hidden members used by apps."

2018-07-24 09:27:01 -07:00

app

Merge "Add @UnsupportedAppUsage annotations"

2018-08-15 07:57:40 -07:00

appwidget

Add @UnsupportedAppUsage annotations

2018-08-09 15:15:57 +01:00

bluetooth

Merge "Fix NPE when starting advertising with null GATT"

2018-08-09 06:48:17 +00:00

companion

Add @UnsupportedAppUsage annotations

2018-08-09 15:35:32 +01:00

content

resolve merge conflicts of 2ee069f73d to stage-aosp-master

2018-08-17 01:43:27 -07:00

database

resolve merge conflicts of b41f50dfd0 to pi-dev-plus-aosp

2018-08-16 10:25:51 +01:00

ddm

Add @UnsupportedAppUsage annotations

2018-08-01 15:35:51 +01:00

debug

…

gesture

…

hardware

Merge "Camera: Documentation update to remove physicalIds" into pi-dev

2018-08-16 17:29:35 -07:00

inputmethodservice

resolve merge conflicts of d609a40342 to stage-aosp-master

2018-08-06 10:14:20 +01:00

metrics

…

net

Merge "Add @UnsupportedAppUsage annotations" am: d717c04b12

2018-08-16 03:29:58 -07:00

nfc

resolve merge conflicts of 92b78539e3 to stage-aosp-master

2018-08-03 11:05:23 +01:00

os

Merge "Clatd-related commands porting" am: 3b9ae0ae48

2018-08-15 00:56:39 -07:00

permissionpresenterservice

Add @UnsupportedAppUsage annotations

2018-08-09 18:03:24 +01:00

preference

docs: fixed typo

2018-06-04 13:25:13 -07:00

print

Merge "Add @UnsupportedAppUsage annotations"

2018-08-01 15:58:23 -07:00

printservice

…

privacy

…

provider

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 16:41:38 -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 "Add @UnsupportedAppUsage annotations" am: 9feefd2f5f

2018-08-16 03:05:51 -07:00

speech

Merge "Add @UnsupportedAppUsage annotations" am: 14dea1f70c

2018-08-09 07:15:52 -07:00

text

Merge "Add @UnsupportedAppUsage annotations" am: 348a7e7315

2018-08-16 03:25:16 -07:00

transition

Don't clear focus during transition animations

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

util

Merge "Add @UnsupportedAppUsage annotations" am: 06f2e6b7c8

2018-08-16 03:01:23 -07:00

view

Merge "docs: fixed typo" into pi-dev

2018-08-13 16:04:10 -07:00

webkit

Merge "Update WebView#clearClientCertPreferences docs." into pi-dev

2018-08-14 18:22:49 +00:00

widget

Merge "docs: fixed typo" into pi-dev

2018-08-14 13:31:20 -07:00

package.html

…