Merge "Fix some WM unit tests" into oc-dev

author Andrii Kulian <akulian@google.com>

Mon, 3 Apr 2017 17:33:56 +0000 (17:33 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 3 Apr 2017 17:34:01 +0000 (17:34 +0000)
author Andrii Kulian <akulian@google.com>
Mon, 3 Apr 2017 17:33:56 +0000 (17:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 3 Apr 2017 17:34:01 +0000 (17:34 +0000)
diff --cc services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java
Simple merge
author	Andrii Kulian <akulian@google.com>
	Mon, 3 Apr 2017 17:33:56 +0000 (17:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 3 Apr 2017 17:34:01 +0000 (17:34 +0000)