Man Cao 80bea9cde1 resolved conflicts for merge of 8fb82074 to master ...

Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb

2015-06-24 17:28:01 -07:00

..

accessibility

…

appwidget

GetInstalledProvidersForProfiles should never return null object.

2015-06-18 12:59:51 -07:00

backup

…

core

resolved conflicts for merge of 8fb82074 to master

2015-06-24 17:28:01 -07:00

devicepolicy

Reset permission policy to default when device owner goes away

2015-06-24 17:19:19 +01:00

java/com/android/server

Introduce system user and primary user.

2015-06-23 15:25:37 -07:00

midi

MidiDeviceServer: Fix race condition in setting device server's mDeviceInfo

2015-06-11 13:28:36 -07:00

net

…

print

…

restrictions

…

tests

am 0a99ca6e: am daf6b73b: am 9065b810: Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev

2015-06-23 21:31:00 +00:00

usage

system_server: optimize app idle parole state change

2015-06-22 15:35:19 -07:00

usb

Merge "remove setLatestEventInfo from USB" into mnc-dev

2015-06-15 12:23:26 +00:00

voiceinteraction

Merge "Only grant runtime permissions to special components." into mnc-dev

2015-06-19 22:26:32 +00:00

Android.mk

…