Nicolas Geoffray f95fb4fb17 resolve merge conflicts of 4b092e4 to master ...

Change-Id: I29a92ce3afe3a7b2851126a921879631e9846a40

2016-05-31 13:35:41 +01:00

..

accessibility

Ensure MotionEvent.split() won't be given an invalid value.

2016-05-25 12:38:58 -07:00

appwidget

Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev

2016-05-25 20:45:44 +00:00

backup

Use backstop timeouts on asynchronous countdown during preflight

2016-05-25 18:13:30 -07:00

core

resolve merge conflicts of 4b092e4 to master

2016-05-31 13:35:41 +01:00

devicepolicy

Do not allow DPM.resetPassword() when child profile exists or user is locked

2016-05-25 13:09:44 +00:00

java/com/android/server

Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae

2016-05-25 14:33:57 +00:00

midi

Init MidiService once system user gets unlocked.

2016-05-09 12:51:18 -07:00

net

Merge "Don't drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev

2016-05-27 14:58:48 +00:00

print

Reconnect to service when it is updated

2016-05-10 15:50:12 -07:00

restrictions

…

tests

resolve merge conflicts of 8de7c95 to master

2016-05-27 16:10:34 -07:00

usage

…

usb

Fix notifications for USB PD enabled devices

2016-05-19 20:46:21 +00:00

voiceinteraction

Use correct synchronization lock

2016-05-23 17:21:08 -07:00

Android.mk

…