Dianne Hackborn 24937d235d resolve merge conflicts of 3aee38c86e to master. ...

Change-Id: I9ff3f92b37e24f5f0527a0034b159920f6d7ffe1

2015-11-03 12:47:12 -08:00

..

accessibility

Refactor MagnificationController out to its own class

2015-10-30 15:24:51 -04:00

appwidget

…

backup

…

core

resolve merge conflicts of 3aee38c86e to master.

2015-11-03 12:47:12 -08:00

devicepolicy

Introduced short-term lock for UMS internal state

2015-11-03 11:56:33 -08:00

java/com/android/server

…

midi

…

net

Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9 am: c52503acf0

2015-10-29 18:20:30 +00:00

print

…

restrictions

…

tests

Introduced short-term lock for UMS internal state

2015-11-03 11:56:33 -08:00

usage

resolve merge conflicts of 3aee38c86e to master.

2015-11-03 12:47:12 -08:00

usb

UsbDeviceManager: set mUsbDataUnlocked=false on user switch am: 5701321701 am: aa330c0dc2 am: d33d66e26c

2015-10-29 21:57:12 +00:00

voiceinteraction

…

Android.mk

…