Christopher Lane 111db01a26 resolved conflicts for merge of 381ac080 to master ...

Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21

2014-04-14 15:14:01 -07:00

..

accessibility

am 0f7ed1f4: Merge "Adding system support for a single accessibility focus."

2014-04-11 18:24:38 +00:00

appwidget

Unlinked providers STILL shouldn't cause crashes

2014-03-27 13:22:26 -07:00

backup

Don't crash on null installer package bookkeeping.

2014-04-08 17:10:54 -07:00

core

resolved conflicts for merge of 381ac080 to master

2014-04-14 15:14:01 -07:00

devicepolicy

Add new call to DevicePolicyManager to enable a profile.

2014-04-11 16:51:49 +01:00

java/com/android/server

am d2a11d97: Merge "Add explicit close of Scanner input"

2014-04-11 17:18:14 +00:00

print

am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

2014-02-11 08:33:50 +00:00

tests

am 80edaa67: am 24c089a8: Fix build.

2014-04-11 10:57:28 +00:00

usb

Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices."

2014-04-11 21:18:51 +00:00

Android.mk

Build logtags for services

2014-03-17 15:31:04 -07:00