Erik Kline da70b6b287 Merge "Stop setting net.hostname" am: 06178a39f8 ...

am: 35cc49e03f

Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23

2016-12-14 08:07:01 +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 "Stop setting net.hostname" am: 06178a39f8

2016-12-14 08:07:01 +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 "DHCPv4 anonymity profile: support skipping hostname option"

2016-12-14 03:22:12 +00:00

print

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

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

restrictions

…

retaildemo

Enabling wifi on new demo session

2016-09-23 14:14:41 -07:00

tests

DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4.

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

usage

Handle charging state separately from temporary parole

2016-09-15 13:38:43 -07:00

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

…