Wale Ogunwale 16a6279e5f resolved conflicts for merge of 2094bf7b to master ...

Change-Id: I1820d186ca602bb3cd21a15f3c23f7d6d309d43b

2015-04-01 11:54:26 -07:00

..

accessibility

Merge restored accessibility enable state, don't overwrite

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

appwidget

…

backup

Fixes to full-backup scheduling edge cases

2015-03-30 18:00:52 -07:00

core

resolved conflicts for merge of 2094bf7b to master

2015-04-01 11:54:26 -07:00

devicepolicy

Enterprise quick contact 1/2

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

java/com/android/server

Add CameraService to system server.

2015-03-31 12:01:22 -07: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

Support for nested bundles in setApplicationRestrictions

2015-03-30 17:59:07 -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

Add event scheduling support to USB MIDI Manager code

2015-03-31 08:57: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