Narayan Kamath a00ed7f725 am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp ...

* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
  Move certain internal activity manager methods to new class.

2014-04-09 14:03:47 +00:00

..

accessibility

Make Keyguard a library and make StatusBar the new Keyguard.

2014-03-28 22:35:03 +01: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

am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

2014-04-09 14:03:47 +00:00

devicepolicy

Fix privilege escalation for preferred activities

2014-03-28 15:09:49 +00:00

java/com/android/server

Merge "Launcher APIs and broadcasts for managed profiles"

2014-04-08 22:04:20 +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 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.

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

usb

Revert "Initial implementation of USB Audio output."

2014-04-07 18:01:29 -07:00

Android.mk

Build logtags for services

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