Suprabh Shukla f9c376b786 resolve merge conflicts of 37ad463 to master ...

Change-Id: I51b2097ac3ea4ce3ec8bb29e674d1cdd789aa1a1

2016-09-07 15:55:04 -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

…

core

Merge changes I627e47c6,I9f949799

2016-09-07 18:23:40 +00:00

devicepolicy

resolve merge conflicts of 37ad463 to master

2016-09-07 15:55:04 -07: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

Merge "Refactored INetworkPolicyListener callbacks."

2016-09-07 17:42:27 +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

…