Jorim Jaggi 00cd47a2d2 resolved conflicts for 0fb3f695 to master. ...

Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a

2015-09-09 18:40:05 -07:00

..

accessibility

Cleanup USER_OWNER in a11y service and tests

2015-09-02 13:15:21 -07:00

appwidget

…

backup

am a6888d6d: am b5bcd607: am 27c5cfd7: am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev

2015-08-28 20:37:24 +00:00

core

resolved conflicts for 0fb3f695 to master.

2015-09-09 18:40:05 -07:00

devicepolicy

[split system] Tentatively support running DO on meat user

2015-09-08 11:24:58 -07:00

java/com/android/server

resolved conflicts for merge of fcf9ab5a to master

2015-09-03 00:12:30 +09:00

midi

BLE-MIDI: change binding for BluetoothMidiService

2015-09-08 13:48:16 -07:00

net

am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev

2015-09-03 17:34:50 +00:00

print

…

restrictions

…

tests

am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev

2015-09-09 01:42:56 +00:00

usage

am 1559f1c5: am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

2015-08-19 02:21:23 +00:00

usb

Merge "Broadcast ACTION_USB_STATE only if necessary."

2015-08-26 09:36:40 +00:00

voiceinteraction

…

Android.mk

…