Svetoslav Ganov 24c27754c5 resolve merge conflicts of a2c1196 to master - continued ...

Change-Id: I1b3c0e1a42b4cbb025de049e95d5377a162d58d1

2016-08-31 18:09:00 -07:00

..

accessibility

Fix crash when user changes after a11yservice dies am: e797b84ed2 am: 575e714616

2016-08-29 21:52:48 +00:00

appwidget

Fixing typo in dump log. am: b43ba86811 am: 1de1a3bfcc

2016-08-30 01:20:12 +00:00

backup

DO NOT MERGE: Backport N backup/restore stability work to M

2016-08-08 10:48:26 -07:00

core

resolve merge conflicts of a2c1196 to master - continued

2016-08-31 18:09:00 -07:00

devicepolicy

Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner

2016-08-30 17:41:48 +01:00

java/com/android/server

Merge "Add KeyAttestationApplicationIdProviderService to SystemServer"

2016-08-29 16:18:51 +00:00

midi

Squashed commit of the following:

2016-08-17 08:45:39 -07:00

net

Remove INetd AIDL reference

2016-08-30 11:40:20 +09:00

print

Hold no locks when calling RemotePrintSpooler

2016-08-29 21:29:34 +00:00

restrictions

…

retaildemo

Add unit tests for RetailDemoModeService.

2016-08-18 18:49:29 -07:00

tests

Network switch notifications: rate & daily limits am: 84e6f1232c am: 858499b2c0 am: 2c535a4f7c

2016-08-31 23:31:56 +00:00

usage

AppIdleHistory: Only write screen on durations during regular sync

2016-08-17 16:42:46 -07:00

usb

allow external USB host management

2016-08-24 15:00:08 -07:00

voiceinteraction

Fix issue #30929080: Default Assist app is set to None...

2016-08-18 17:33:41 -07:00

Android.mk

…