Julia Reynolds b00889ddc2 resolved conflicts for merge of b259603d to master ...

Change-Id: Ia74bb64ce5946a86ecf05b8c4e258dd2ac68ba04

2014-08-20 22:42:08 -04:00

..

accessibility

…

appwidget

Remove system_server classes from the boot image.

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

backup

Minor restore fixes

2014-08-18 22:01:43 +00:00

core

am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

2014-08-21 00:57:08 +00:00

devicepolicy

resolved conflicts for merge of b259603d to master

2014-08-20 22:42:08 -04: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

…