Skip to content
Commit 179bf5df authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Merge "WakeAndUnlock: Make sure blanking is never animated" into... 

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

Change-Id: Ia5bbf42d79281c2ef88c75c59ebc65e0b90a274b
parents 33a62f92 f8a95c8c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment