OSDN Git Service

Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Mon, 31 Jul 2017 16:48:44 +0000 (16:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 16:48:44 +0000 (16:48 +0000)
am: cbab3edc3e

Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed


Trivial merge