David Christie 362668b6f7 resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 ...

am: e24eb2dbb5

Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10

2016-08-24 22:23:42 +00:00

..

accessibility

…

appwidget

…

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 am: 6195acc2b5

2016-08-24 22:23:42 +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

Compute AnyMotionDetector angle using atan2.

2016-06-11 00:43:11 +00:00

usage

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

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

usb

DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.

2015-11-16 14:05:29 -08: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

…