Andreas Gampe 1b4e56ac36 resolved conflicts for merge of 1d67698b to master ...

Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b

2015-03-13 00:17:40 -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 run full backups until package metadata has been pushed

2015-03-12 18:24:30 -07:00

core

resolved conflicts for merge of 1d67698b to master

2015-03-13 00:17:40 -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

resolved conflicts for merge of b6b9fe21 to master

2015-03-13 00:04:10 -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

AudioService: Write base stream volume changes to the event log.

2015-03-12 09:54:10 -04:00

voiceinteraction

Rework voice interaction session lifecycle.

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

Android.mk

…