OSDN Git Service

Merge commit 'bf581034' into manualmerge
authorCraig Mautner <cmautner@google.com>
Wed, 13 Nov 2013 03:17:06 +0000 (19:17 -0800)
committerCraig Mautner <cmautner@google.com>
Wed, 13 Nov 2013 03:17:06 +0000 (19:17 -0800)
commitb12eb71c4fd82ac27fb3fe9a86cf9d92e0e511f2
treec4d685ad600e90d2dde56aebb379e3997a0ef945
parent764197b14f2c4f1b11939c8913ba707748362950
parentbf581034f9771fd67ea796e91ce28787c33fbb82
Merge commit 'bf581034' into manualmerge

Conflicts:
tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb
services/java/com/android/server/am/ActivityStack.java
services/java/com/android/server/wm/WindowManagerService.java