Andreas Gampe 2c1078fbbd resolved conflicts for merge of b6d6c04a to master ...

Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7

2015-03-10 15:45:36 -07:00

..

accessibility

Resolved conflict for merge of 4a0e0237 to master

2015-02-18 18:40:20 -08:00

appwidget

Remove widgets for packages no longer whitelisted by admin

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

backup

Don't enqueue allowBackup=false apps for full backup attempts

2015-03-05 18:04:16 -08:00

core

resolved conflicts for merge of b6d6c04a to master

2015-03-10 15:45:36 -07:00

devicepolicy

Block setting wallpapers from managed profiles.

2015-03-09 10:39:21 +00:00

java/com/android/server

Enable Ethernet if the device has FEATURE_USB_HOST.

2015-03-05 16:06:43 +09:00

print

…

restrictions

Remove unused imports in frameworks/base.

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

tests

Remove deprecated version of setProfileOwner that takes packageName

2014-12-24 09:38:13 +00:00

usage

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

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

usb

Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive()

2015-03-04 20:38:37 -08:00

voiceinteraction

Rework voice interaction session lifecycle.

2015-02-25 17:36:17 -08:00

Android.mk

…