Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev

author Chong Zhang <chz@google.com>

Fri, 12 Aug 2016 00:42:56 +0000 (00:42 +0000)

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

Fri, 12 Aug 2016 00:42:57 +0000 (00:42 +0000)
author Chong Zhang <chz@google.com>
Fri, 12 Aug 2016 00:42:56 +0000 (00:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 12 Aug 2016 00:42:57 +0000 (00:42 +0000)
diff --cc services/core/java/com/android/server/wm/WindowSurfacePlacer.java
Simple merge
author	Chong Zhang <chz@google.com>
	Fri, 12 Aug 2016 00:42:56 +0000 (00:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 12 Aug 2016 00:42:57 +0000 (00:42 +0000)