Neil Fuller cea283535c resolved conflicts for merge of 962a11ad to master ...

Change-Id: I8c6ac62d7267629c019997bb343d863aa56264eb

2015-03-31 11:15:39 +01:00

..

accessibility

Merge restored accessibility enable state, don't overwrite

2015-03-16 17:39:07 -07:00

appwidget

Remove widgets for packages no longer whitelisted by admin

2015-02-17 20:33:36 +00:00

backup

Respect the transport's requestFullBackupTime() backoff

2015-03-27 17:58:18 -07:00

core

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00

devicepolicy

Enterprise quick contact 1/2

2015-03-30 16:28:39 -07:00

java/com/android/server

Merge "Add GraphicsStatsService"

2015-03-30 19:39:27 +00:00

midi

Make the MIDI Manager optional, enabled by "android.software.midi" feature

2015-03-27 13:23:41 -07:00

net

DHCP: Don't write options longer than 255 bytes.

2015-03-20 16:32:44 +09:00

print

Replace usages of deprecated Resources.getColor() and getColorStateList()

2015-03-18 18:37:18 -07:00

restrictions

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

tests

Fix build

2015-03-28 21:08:44 -07:00

usage

Merge "Fix issue where pruned UsageStats files would not be removed from index"

2015-03-02 22:23:44 +00:00

usb

Move MIDI utilities for internal use to com.android.internal.midi package

2015-03-30 09:06:06 -07:00

voiceinteraction

Add ability to get a screenshot for assist.

2015-03-17 16:45:51 -07:00

Android.mk

Make the MIDI Manager optional, enabled by "android.software.midi" feature

2015-03-27 13:23:41 -07:00