Makoto Onuki 088849fc5e resolve merge conflicts of c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master ...

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

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

..

accessibility

Add config value for fingerprint gesture support

2018-04-20 15:53:58 -07:00

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 c02b2ec3f179820c31c470d89b919ce721513472 to stage-aosp-master

2018-08-03 08:07:01 -07: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 bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master

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

midi

…

net

Merge "Always close file descriptors"

2018-07-05 05:20:25 -07:00

print

Merge "Avoid onServiceDisconnected() for unbind Service"

2018-07-23 12:10:57 -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

Ensure Notification re-post with setOnlyAlertOnce(true) silences sound.

2018-07-17 18:23:22 +00:00

usage

DO NOT MERGE Fix security exception due to incorrect flags

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

usb

Merge "UsbDescriptor: Add finite timeout to control transfer"

2018-07-17 13:59:15 -07:00

voiceinteraction

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

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

Android.bp

Mark installable jars with installable: true

2018-06-27 11:49:44 -07:00

art-profile

Update system server profile

2018-07-26 10:28:18 -07:00