Merge "Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am: cbab3edc3e am: 0cd8a31c12" into oc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-07-31 16:57:19 +00:00
committed by Android (Google) Code Review

Diff Content Not Available