Adam Lesinski 350159c65a resolved conflicts for merge of 6984e4f9 to master ...

Conflicts:
	services/core/java/com/android/server/notification/NotificationManagerService.java

Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63

2014-03-27 18:26:11 +00:00

..

accessibility

Wrong constant used for undefined accessibility window id.

2014-03-25 17:27:37 -07:00

appwidget

Don't crash when handling unlinked widget bindings

2014-03-26 14:42:56 -07:00

backup

App widget backup/restore infrastructure

2014-03-20 12:30:51 -07:00

core

resolved conflicts for merge of 6984e4f9 to master

2014-03-27 18:26:11 +00:00

devicepolicy

Merge "Enables a profile owner or device owner to set and clear default intent handler activities."

2014-02-24 10:16:28 +00:00

java/com/android/server

Note libselinux dependency on packages.list format changes.

2014-03-26 09:19:12 -04: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 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.

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

usb

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

2014-03-21 03:10:34 +00:00

Android.mk

Build logtags for services

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