Craig Mautner 4c07d0246f Merge commit 'f5030ecb' into manualmerge ...

Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5

2014-06-11 17:12:59 -07:00

..

accessibility

…

appwidget

…

backup

Add full-backup stream API to BackupTransport

2014-06-02 18:57:21 -07:00

core

Merge commit 'f5030ecb' into manualmerge

2014-06-11 17:12:59 -07:00

devicepolicy

Allow profile and device owners to change and get the master volume mute state.

2014-06-09 14:18:01 -04:00

java/com/android/server

Merge "Don't enable Ethernet on the emulator." into lmp-preview-dev

2014-06-10 22:31:57 +00:00

print

Refactor printing

2014-06-06 13:33:16 -07:00

restrictions

…

tests

Fix build.

2014-06-10 16:11:08 -07:00

usb

UsbDebuggingManager: remove log spam when disconnecting USB

2014-06-05 08:24:16 -07:00

voiceinteraction

…

Android.mk

…