David Christie e24eb2dbb5 resolve merge conflicts of a2399b4 to mnc-dev ...

am: 6195acc2b5

Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be

2016-08-24 22:16:07 +00:00

..

accessibility

Add accessibility event for assist disclosure

2015-06-30 00:27:14 +00:00

appwidget

Always call onProvidersChanged() when packages containing widgets are updated.

2015-08-11 14:29:13 -07:00

backup

DO NOT MERGE: Backport N backup/restore stability work to M

2016-08-08 10:48:26 -07:00

core

resolve merge conflicts of a2399b4 to mnc-dev

2016-08-24 22:16:07 +00:00

devicepolicy

DO NOT MERGE: Reduce shell power over user management.

2016-06-21 18:45:13 +00:00

java/com/android/server

Fix vulnerability where large GPS XTRA data can be injected.

2016-07-25 17:13:23 -07:00

midi

BLE-MIDI: change binding for BluetoothMidiService

2015-10-13 15:40:03 +00:00

net

Don't crash if a DHCP server doesn't send the server ID option.

2015-10-29 16:09:16 +09:00

print

…

restrictions

…

tests

Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74

2015-11-13 02:09:35 +00:00

usage

DO NOT MERGE ANYWHERE: Hack to get devices booting again.

2016-02-19 21:06:14 +00:00

usb

UsbDeviceManager: set mUsbDataUnlocked=false on user switch

2015-10-29 13:07:52 -07:00

voiceinteraction

Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-dev

2015-10-15 01:24:45 +00:00

Android.mk

…