OSDN Git Service

resolve merge conflicts of 74bc31f to master
authorDan Willemsen <dwillemsen@google.com>
Sat, 30 Jul 2016 20:02:59 +0000 (13:02 -0700)
committerDan Willemsen <dwillemsen@google.com>
Sat, 30 Jul 2016 20:02:59 +0000 (13:02 -0700)
commit117197fcd1e9008eaaca8dfa9e4c1f2d039e949b
treef731e1ec63a23697cad05ee7909fcff791557b96
parentc5081a897bfa01993c09f758549d05f47ac152e7
parent74bc31fe43565bb0f188800b531f176c6fe06a90
resolve merge conflicts of 74bc31f to master

Change-Id: Ib922ebfb3d91a9c837181a3c652f079cec127f3e
services/core/java/com/android/server/wm/WallpaperController.java
services/core/java/com/android/server/wm/WindowState.java