Jeff Sharkey 5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp ...

Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22

2016-04-25 15:53:50 -06:00

..

accessibility

Merge "Fix a11y key event handling from multiple devices." into nyc-dev

2016-04-21 01:38:49 +00:00

appwidget

Fix widget not being masked when freshly added.

2016-04-13 17:21:07 +01:00

backup

…

core

resolve merge conflicts of c79a568 to nyc-dev-plus-aosp

2016-04-25 15:53:50 -06:00

devicepolicy

Merge "Deleting lock screen clears all CA approvals" into nyc-dev

2016-04-22 11:02:43 +00:00

java/com/android/server

Unbundle RemoteService on TV - part 3

2016-04-22 12:21:34 -07:00

midi

MidiService: fix resource leak

2016-04-18 16:45:22 -07:00

net

Add state and callback logs for IpManager dump

2016-04-25 13:11:58 +09:00

print

Send update notifications when the status of a print job updates and

2016-04-21 15:33:42 -07:00

restrictions

…

tests

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev

2016-04-21 13:47:13 +00:00

usage

Fix issue #28118215: Crash during system boot due to null carrier apps

2016-04-11 13:02:08 -07:00

usb

…

voiceinteraction

Fix a regression in assist when context is disabled

2016-04-22 15:43:21 -07:00

Android.mk

…