Narayan Kamath 3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp ...

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a

2014-05-01 15:32:20 +01:00

..

accessibility

…

appwidget

…

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

resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp

2014-05-01 15:32:20 +01:00

devicepolicy

…

java/com/android/server

am 2a9a0471: Merge "Package manager changes for dual zygote stack."

2014-05-01 14:00:43 +00:00

print

…

tests

Fix build.

2014-04-11 10:50:43 +00:00

usb

am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev

2014-04-16 23:49:20 +00:00

Android.mk

…