Neil Fuller 6653f2b201 Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 ...

am: 7a5ba3f59d

Change-Id: Idcee9696bdb3cd2e65809f44eff0f8ff77782d27

2019-08-23 21:48:12 -07:00

..

accessibility

…

appprediction

…

appwidget

…

autofill

…

backup

DO NOT MERGE Add stop method to backup handler thread.

2019-07-24 14:39:27 -07:00

companion

…

contentcapture

…

contentsuggestions

…

core

Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445

2019-08-23 21:48:12 -07:00

coverage

…

devicepolicy

…

java/com/android/server

Merge "Start platform compat service eariler." into stage-aosp-master am: 4535b04b33 am: f3fe588229

2019-08-20 02:53:39 -07:00

midi

…

net

Remove DeviceConfig usage from NetworkStackClient

2019-08-22 09:50:29 +00:00

print

…

restrictions

…

robotests

Merge "Convert frameworks/base/services/robotests to Android.bp" into stage-aosp-master am: 6c074332a9

2019-07-24 19:18:31 -07:00

startop

…

systemcaptions

…

tests

Merge "Limit the number of Notif Channels per app" into qt-qpr1-dev

2019-08-22 12:00:20 -07:00

usage

…

usb

…

voiceinteraction

Fix legacy role holder resolution for assistant, dialer and SMS.

2019-08-22 05:08:22 +00:00

Android.bp

Merge "Add a platform-compat-config to the framework services."

2019-08-21 04:05:51 -07:00

art-profile

…