Marie Janssen c816141bce resolve merge conflicts of 9cc7ebe to stage-aosp-master ...

Change-Id: Ia1cdf49d77a574c38ed5cc33c31d5cf930103484

2016-12-29 12:44:03 -08:00

..

accessibility

…

appwidget

…

backup

Merge "Fix the deadlock problem"

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

core

resolve merge conflicts of 9cc7ebe to stage-aosp-master

2016-12-29 12:44:03 -08:00

devicepolicy

Don't expose default strong auth timeout as constant

2016-10-13 22:52:38 +00:00

java/com/android/server

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

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

midi

…

net

Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."

2016-12-15 12:22:06 +00:00

print

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

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

restrictions

…

retaildemo

…

tests

Clear and restore the calling ID.

2016-12-22 19:01:43 +00:00

usage

…

usb

Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.

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

voiceinteraction

…

Android.mk

…