Brian Carlstrom 6422abef78 resolved conflicts for merge of 3bbef521 to master ...

Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94

2014-05-07 14:46:40 -07:00

..

accessibility

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

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

appwidget

Bump up priority of system receiving BOOT_COMPLETED.

2014-05-02 16:29:10 -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 3bbef521 to master

2014-05-07 14:46:40 -07:00

devicepolicy

Fix build

2014-05-07 15:26:34 -04:00

java/com/android/server

am edb88bcd: Merge "Use package usage information to decide what dex files to optimize in PackageManagerService"

2014-05-07 03:33:37 +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

Bump up priority of system receiving BOOT_COMPLETED.

2014-05-02 16:29:10 -07:00

voiceinteraction

Further work on voice interaction services.

2014-05-05 11:18:08 -07:00

Android.mk

Initial implementation of new voice interaction API.

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