yuanjiahsu b39b469b12 resolve merge conflicts of 183271d1d2 to master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I219a85189fb4207a0605ca541f8ecc29f5ee6808

2018-11-20 20:55:49 +08:00

..

accessibilityservice

Update a11y recommended timeout api.

2018-11-09 10:24:07 +08:00

accounts

Document AccountManager method failures for locked user.

2018-10-30 14:56:53 -07:00

animation

Merge "docs: fixing errors found with lint check" into pi-dev am: 8c7d2142f6

2018-10-09 13:29:04 -07:00

annotation

…

app

Merge "Add privileged API to control keyguard secure notifications"

2018-11-20 04:50:52 +00:00

appwidget

Starting the default activity when an app widget's

2018-11-09 13:24:39 -08:00

bluetooth

Merge "Be the current user to get A2DP proxy" into pi-dev

2018-10-30 22:22:14 +00:00

companion

…

content

Merge "Add Intent#EXTRA_CONTENT_QUERY."

2018-11-19 22:52:11 +00:00

database

Move TranslatingCursor to frameworks/base.

2018-11-16 14:37:41 -08:00

ddm

…

debug

Move AdbDebuggingManager to AdbService

2018-10-31 16:11:02 +09:00

gesture

…

hardware

Merge "Reorders arguments in Context Hub Service methods"

2018-11-19 19:12:36 +00:00

inputmethodservice

Introduce multi-client IME for special form factors

2018-11-12 15:20:20 -08:00

metrics

MetricsLogger writes to both event log and statsd

2018-10-03 12:49:10 -07:00

net

Merge "Add IPv6 link-local address generation from EUI-48" am: a2a9df3e3a

2018-11-19 16:48:22 -08:00

nfc

Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed

2018-10-24 16:14:06 -07:00

os

Merge "Update documentation for ThreadLocalWorkSource."

2018-11-19 17:42:05 +00:00

permission

Have a map of background -> foreground permssions

2018-11-08 09:19:51 -08:00

permissionpresenterservice

Add documentation to recently added system API

2018-09-19 15:42:59 +00:00

preference

Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed

2018-10-24 16:14:06 -07:00

print

…

printservice

…

privacy

…

provider

Merge "Pno list recency optimization: Settings.global flag"

2018-11-15 22:28:14 +00:00

rolecontrollerservice

Groundwork for default grants in RoleController

2018-11-14 16:37:27 -08:00

se/omapi

…

security

Merge "Update KeyStore for new biometric modalities"

2018-11-16 22:52:30 +00:00

service

Merge "Minor changes on IntelligenceManager APIs."

2018-11-20 00:09:31 +00:00

speech

Remove extra call to dispatchStart().

2018-10-18 09:56:03 -07:00

text

Merge "Revert "Revert "Refactor TextLine class"""

2018-11-17 01:46:12 +00:00

transition

Merge "Make transitions Scene.getCurrentScene() public"

2018-11-01 14:34:08 +00:00

util

resolve merge conflicts of 183271d1d2 to master

2018-11-20 20:55:49 +08:00

view

Merge "Minor changes on IntelligenceManager APIs."

2018-11-20 00:09:31 +00:00

webkit

Implemented WebView.onProvideContentCaptureStructure()

2018-11-13 16:22:25 -08:00

widget

Merge "Remove unused media2 widgets"

2018-11-19 01:20:07 +00:00

package.html

…