Neil Fuller ca48eb7fa9 resolve merge conflicts of bc38909bf3 to stage-aosp-master ...

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib06f2869e5aa1788c8d5fc281a8565420e93d8f7

2018-06-27 11:40:06 +01:00

..

accessibility

…

appwidget

Merge "Prevent instant apps to host app widgets" into pi-dev

2018-05-15 19:05:08 +00:00

autofill

Merge "Minor autofill logging improvements." into pi-dev

2018-06-06 23:06:28 +00:00

backup

Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev

2018-05-03 02:05:17 +00:00

companion

…

core

resolve merge conflicts of bc38909bf3 to stage-aosp-master

2018-06-27 11:40:06 +01:00

coverage

…

devicepolicy

Start SecurityLogMonitor after broadcasts are allowed.

2018-06-07 11:16:46 +01:00

java/com/android/server

resolve merge conflicts of bc38909bf3 to stage-aosp-master

2018-06-27 11:40:06 +01:00

midi

…

net

Randomize the local Wifi IPv4 address

2018-06-06 12:10:36 +09:00

print

Allow Print subsystem to work with services provided by instant app

2018-05-10 15:26:39 -07:00

restrictions

…

robotests

Merge "Fix [kv-3]PerformBackupTask using last package status to decide status sent to IBackupObserver." into pi-dev

2018-05-03 02:05:17 +00:00

tests

Merge "Add more behavior to TimeDetectorService"

2018-06-26 05:14:31 -07:00

usage

DO NOT MERGE Fix security exception due to incorrect flags

2018-06-06 19:51:24 +00:00

usb

…

voiceinteraction

Merge "Fixing a couple crashes in the SoundTriggerTestApp" into pi-dev

2018-05-10 06:57:32 +00:00

Android.bp

…

art-profile

Remove FlpHardwareProvider

2018-05-25 16:38:52 +09:00