Adam Vartanian 91d61ea0ed Merge "Inline two short methods from Conscrypt" ...

am: 9da9b33cc2

Change-Id: I4c66064ec1a0569f7766282d6dbee5202906ae00

2018-09-25 02:04:57 -07:00

..

accessibilityservice

resolve merge conflicts of 20fcc2eb4c to stage-aosp-master

2018-08-02 17:39:43 +01: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 <p> to UnsupportedAppUsage javadoc."

2018-08-28 15:30:29 +00:00

app

Merge "Avoiding potential NPE when dumping to proto."

2018-09-11 18:26:45 -07:00

appwidget

Framework: Remove a nonsensical substring(0)

2018-09-05 16:58:45 -07:00

bluetooth

Merge "Unhide the LE CoC APIs"

2018-09-18 18:31:26 +00:00

companion

Add @UnsupportedAppUsage annotations

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

content

Merge "Fix typo in IntentFilter documentation."

2018-09-17 19:59:26 -07:00

database

Fix OWNERS (change google.com to android.com)

2018-08-24 14:58:42 -07:00

ddm

Add @UnsupportedAppUsage annotations

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

debug

…

gesture

…

hardware

Merge "Stop invoke initAppOps in Camera default constructor."

2018-09-10 20:00:30 -07:00

inputmethodservice

Let SoftInputWindow handle BadTokenException

2018-08-29 19:56:02 -07:00

metrics

use the dedicated latency field in logmaker

2018-03-14 21:27:11 -04:00

net

Add ConnectivityManager.getConnectionOwnerUid()

2018-09-21 06:16:09 +00:00

nfc

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

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

os

Merge "Add ConnectivityManager.getConnectionOwnerUid()"

2018-09-21 21:04:20 +00:00

permissionpresenterservice

Add @UnsupportedAppUsage annotations

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

preference

Add @UnsupportedAppUsage annotations

2018-08-17 13:51:26 +01:00

print

Merge "Add @UnsupportedAppUsage annotations"

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

printservice

…

privacy

Merge "Add adb command to force generate network watchlist report for testing" into pi-dev

2018-03-29 00:04:26 +00:00

provider

Merge "Add feature flag in Settings."

2018-09-17 07:09:28 -07:00

se/omapi

Merge "Update the Open Mobile API version" into pi-dev

2018-05-09 18:35:47 +00:00

security

Inline two short methods from Conscrypt

2018-09-24 15:34:13 +01:00

service

Merge "Add @UnsupportedAppUsage annotations"

2018-08-15 06:52:39 -07:00

speech

Merge "Add @UnsupportedAppUsage annotations" am: 14dea1f70c

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

text

Add @UnsupportedAppUsage annotations

2018-08-15 12:49:00 +01:00

transition

Add @UnsupportedAppUsage annotations

2018-08-30 13:38:01 +01:00

util

Add feature flag in Settings.

2018-09-11 15:04:51 +08:00

view

Merge "Set InputMethoMananger#mCurRootView to null when window dismissed"

2018-09-19 19:22:12 -07:00

webkit

Merge "Add @UnsupportedAppUsage annotations"

2018-08-20 11:32:10 -07:00

widget

Merge "Use multiple patterns and emails in per-file syntax."

2018-08-24 12:48:10 -07:00

package.html

…