Todd Kennedy 9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master ...

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30

2015-09-25 15:06:49 -07:00

..

accessibility

…

appwidget

…

backup

Make sure to kill restore-at-install full-data targets after restore

2015-08-20 15:08:55 -07:00

core

resolved conflicts for 7de7e0b0 to stage-aosp-master

2015-09-25 15:06:49 -07:00

devicepolicy

…

java/com/android/server

resolved conflicts for merge of ef57e5e0 to stage-aosp-master

2015-09-02 22:57:53 +09:00

midi

…

net

…

print

…

restrictions

…

tests

Don't mark NetworkRequests restricted when they don't have restricted caps

2015-08-19 11:08:38 -04:00

usage

Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

2015-08-18 11:08:10 -07:00

usb

…

voiceinteraction

…

Android.mk

…