Erik Kline 7074b562d9 Merge "More correct startup and shutdown procedures." am: 618d4215a2 ...

am: b6588f9a41

Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae

2016-12-15 05:32:50 +00:00

..

accessibility

Add check for null manger for a11y recents action

2016-11-04 21:12:25 +00:00

appwidget

…

backup

Merge "Fix the deadlock problem"

2016-12-02 22:45:47 +00:00

core

Merge "More correct startup and shutdown procedures." am: 618d4215a2

2016-12-15 05:32:50 +00:00

devicepolicy

If the current device is a watch, fix DeviceOwner/ProfileOwner logic.

2016-11-03 17:35:42 -04:00

java/com/android/server

Merge "[NAN-AWARE] Rename NAN to Aware"

2016-11-06 03:13:31 +00:00

midi

…

net

Merge "More correct startup and shutdown procedures."

2016-12-15 05:25:48 +00:00

print

Move dump() to dumpAsync(), more oneway calls.

2016-12-07 12:24:21 -08:00

restrictions

…

retaildemo

…

tests

DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4.

2016-12-12 14:19:25 -08:00

usage

…

usb

Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.

2016-12-12 11:05:32 -08:00

voiceinteraction

Only purge sound models that violate the new primary key constraint if

2016-10-18 15:36:27 -07:00

Android.mk

…