Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am: 305d6...

author Chong Zhang <chz@google.com>

Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)
author Chong Zhang <chz@google.com>
Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)
diff --cc services/core/java/com/android/server/net/NetworkPolicyManagerService.java
Simple merge
author	Chong Zhang <chz@google.com>
	Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 12 Aug 2016 03:05:54 +0000 (03:05 +0000)