Kenny Guy 6699748d68 resolved conflicts for merge of 06cc91a6 to master ...

Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73

2014-08-21 14:34:37 +01:00

..

accessibility

…

appwidget

Notify app widget hosts when cross-profile providers change.

2014-08-20 20:25:10 +00:00

backup

Maintain transport connection through package updates

2014-08-21 00:25:53 +00:00

core

am b717ef09: am c65e637d: am 2e84b632: Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev

2014-08-21 06:18:21 +00:00

devicepolicy

resolved conflicts for merge of 06cc91a6 to master

2014-08-21 14:34:37 +01:00

java/com/android/server

am 67fe6d1f: Merge "Revert "Fix a bug: unable to start activity when AM is killing the process.""

2014-08-12 21:13:05 +00:00

print

Added notification color to all system notifications

2014-08-20 14:25:18 +02:00

restrictions

Remove system_server classes from the boot image.

2014-08-15 13:37:03 +01:00

tests

Made AlarmClockInfo a nested class in AlarmManager

2014-08-14 02:10:41 +00:00

usage

Remove system_server classes from the boot image.

2014-08-15 13:37:03 +01:00

usb

Added notification color to all system notifications

2014-08-20 14:25:18 +02:00

voiceinteraction

Make sure we initialize to enable the default voice interaction service.

2014-08-15 18:34:10 -07:00

Android.mk

…