OSDN Git Service

Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
authorChong Zhang <chz@google.com>
Fri, 12 Aug 2016 00:52:17 +0000 (00:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 00:52:17 +0000 (00:52 +0000)
am: 305d610fd8

Change-Id: Ib3d0beeed54a52b1185456b0c859859c61548d50


Trivial merge