Jeff Brown fb0448ab4b resolved conflicts for merge of 4f8cd188 to master ...

Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3

2014-05-01 18:19:31 -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

Move internal libcore.os users over to android.system.

2014-04-28 16:38:43 -07:00

core

resolved conflicts for merge of 4f8cd188 to master

2014-05-01 18:19:31 -07:00

devicepolicy

Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"

2014-05-01 10:49:21 +00:00

java/com/android/server

am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

2014-05-01 21:41:58 +00:00

print

…

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