Dan Albert fe1cdd047f resolve merge conflicts of fb54fde402 to master ...

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

2019-01-24 14:46:02 -08:00

..

accessibilityservice

Enable multi-display support for magnification controller

2019-01-18 16:53:32 +08:00

accounts

…

animation

…

annotation

…

app

resolve merge conflicts of fb54fde402 to master

2019-01-24 14:46:02 -08:00

appwidget

…

attention

…

bluetooth

Merge "Introduce system APIs for Bluetooth silence mode." am: d17b284bdb am: 5a5217d2b8

2019-01-24 11:21:36 -08:00

companion

…

content

Merge "Migrate CTS to separate broadcast to scan volume."

2019-01-24 16:25:57 +00:00

database

Update SQLiteQueryBuilder to match aosp-master and internal master

2019-01-21 13:22:25 +00:00

ddm

…

debug

…

gesture

…

hardware

Merge "Make night display auto mode system API"

2019-01-24 21:22:19 +00:00

inputmethodservice

Deprecate InputMethodService#onViewClicked()

2019-01-22 21:47:57 -08:00

metrics

…

net

resolve merge conflicts of fb54fde402 to master

2019-01-24 14:46:02 -08:00

nfc

…

os

Merge "ParcelFileDescriptor: fix various ownership mistakes." am: 8d7976a37e am: d152e75a7c

2019-01-24 12:20:22 -08:00

permission

…

permissionpresenterservice

…

preference

…

print

…

printservice

…

privacy

…

provider

resolve merge conflicts of fb54fde402 to master

2019-01-24 14:46:02 -08:00

rolecontrollerservice

…

se/omapi

…

security

…

service

Merge "Remove @SystemAPI from NotificationAssistantService"

2019-01-24 13:55:30 +00:00

speech

…

text

Deprecate SuggestionSpan#ACTION_SUGGESTION_PICKED

2019-01-21 09:24:26 -08:00

transition

…

util

Merge "Implementing app standby quotas for alarms"

2019-01-24 02:41:08 +00:00

view

Merge "Add per-display RemoteAnimation overrides and flag to disable snapshots"

2019-01-24 21:46:37 +00:00

webkit

Merge "Code cleanup to conform to style guide / linter." am: f5ff8f0661

2019-01-23 18:23:25 -08:00

widget

Rename isHorizontallyScrolling to isHorizontallyScrollable

2019-01-22 14:36:45 -08:00

package.html

…