tree 33fb5a05511116de33728c1ec16772ddd1b86c29
parent 9fadf818c6be103f8cb8014931fca6aec52540fa
parent cbab3edc3eb7ff33126e31c45fd059b45ebb41ca
author Adrian Roos <roosa@google.com> 1501519724 +0000
committer android-build-merger <android-build-merger@google.com> 1501519724 +0000

Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am: cbab3edc3e

Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed