OSDN Git Service

Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
authorAndrii Kulian <akulian@google.com>
Fri, 26 May 2017 23:25:23 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 23:25:23 +0000 (23:25 +0000)
am: e63965cef5

Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0


Trivial merge