Craig Mautner d7bf82d6a4 am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev ...

* commit 'f32b22e9c78cbc0109adbad67e9ff3d7045bd954':
  Move task to top in window manager.

2014-03-25 18:14:15 +00:00

..

accessibility

Check feature bits before loading optional services

2014-02-05 19:26:40 +00:00

appwidget

Make SystemService constructor take a Context.

2014-02-10 20:01:43 -08:00

backup

am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev

2014-03-13 17:19:17 +00:00

core

am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev

2014-03-25 18:14:15 +00:00

devicepolicy

Make SystemService constructor take a Context.

2014-02-10 20:01:43 -08:00

java/com/android/server

Merge "Move task to top in window manager." into klp-dev

2014-03-25 16:48:38 +00:00

print

Make SystemService constructor take a Context.

2014-02-10 20:01:43 -08:00

tests

am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.

2014-03-25 09:57:36 +00:00

usb

am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev

2014-03-21 01:14:15 +00:00

Android.mk

Make UsbService optional

2014-02-18 14:57:09 -08:00