Elliott Hughes 10596fbcce resolved conflicts for merge of 3ce4f3d0 to master ...

Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210

2014-04-28 13:53:25 -07:00

..

accessibility

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

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

appwidget

Track package change.

2014-04-24 19:05:43 -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 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

devicepolicy

Allow profile owners to set user restrictions

2014-04-24 16:24:13 -07:00

java/com/android/server

am bbd87eb9: Merge "Track libcore.os\' move to android.system."

2014-04-28 18:17:06 +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

am ee5d512d: 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:56:07 +00:00

voiceinteraction

Rework some of the voice interaction APIs.

2014-04-28 10:54:15 -07:00

Android.mk

Initial implementation of new voice interaction API.

2014-04-24 17:48:58 -07:00