Narayan Kamath a981e3b01a resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp ...

Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316

2014-04-09 14:57:59 +01:00

..

accessibility

Wrong constant used for undefined accessibility window id.

2014-03-25 17:27:37 -07: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 7289f3ab to klp-modular-dev-plus-aosp

2014-04-09 14:57:59 +01: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

…

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

…