Narayan Kamath d862ebb603 resolved conflicts for merge of fcc4fed3 to master ...

Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0

2014-05-21 12:07:35 +01:00

..

accessibility

Simplify accessibility display adjustments

2014-05-12 15:26:45 -07: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 fcc4fed3 to master

2014-05-21 12:07:35 +01:00

devicepolicy

resolved conflicts for merge of fcc4fed3 to master

2014-05-21 12:07:35 +01:00

java/com/android/server

am ec71fed0: Merge "Improve ABI handling for shared user ids."

2014-05-21 06:46:26 +00:00

print

Teach print manager services about user profiles.

2014-05-13 21:21:36 +00:00

tests

Fix build.

2014-05-14 03:56:33 -07:00

usb

Changed namespace of AlsaParser (and components) to correctly reflect their place

2014-05-15 13:22:37 -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