Glenn Kasten 67ffd5e617 resolve merge conflicts of c76a3ac to stage-aosp-master ...

Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25

2016-08-17 13:28:04 -07:00

..

accessibility

Report all content changes to a11y services.

2016-06-22 12:35:26 -07:00

appwidget

Merge "fix safeMode status in AppWidgetService"

2016-08-08 21:53:34 +00:00

backup

Fix adb backup/restore

2016-06-22 13:53:41 -07:00

core

[NetworkPolicy]: Fixes the crash issues caused by null pointer.

2016-08-10 03:49:54 +00:00

devicepolicy

More thorough cleansing of expired users

2016-06-15 11:32:16 -07:00

java/com/android/server

Merge "fix safeMode status in AppWidgetService"

2016-08-08 21:53:34 +00:00

midi

Squashed commit of the following:

2016-08-17 08:45:39 -07:00

net

Don't loop forever on 0-length options.

2016-06-23 15:43:34 +09:00

print

…

restrictions

…

tests

Don't loop forever on 0-length options.

2016-06-23 15:43:34 +09:00

usage

…

usb

resolve merge conflicts of c76a3ac to stage-aosp-master

2016-08-17 13:28:04 -07:00

voiceinteraction

Properly set default voice interactor

2016-06-02 15:25:15 -07:00

Android.mk

…