Hugo Benichi a0cfb157ec resolve merge conflicts of 89aa6fb to mnc-dr-dev ...

Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22

2016-11-10 10:31:31 +09:00

..

accessibility

…

appwidget

…

backup

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

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

core

Public volumes belong to a single user.

2016-11-07 23:35:34 +00:00

devicepolicy

DO NOT MERGE: Reduce shell power over user management.

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

java/com/android/server

Avoid crashing when downloading MitM'd PAC that is too big

2016-09-19 11:19:13 +00:00

midi

BLE-MIDI: change binding for BluetoothMidiService

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

net

resolve merge conflicts of 89aa6fb to mnc-dr-dev

2016-11-10 10:31:31 +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

…