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

Merge "Merge "AOD: Only play wakeup animation when actually waking up" into...

Merge "Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am: feb69bf5 am: 38250275" into oc-mr1-dev-plus-aosp
am: 9a224d4a

Change-Id: Ie9d8c5a90e9763a7d45f50a88284d8029ca18525
parents 4581a624 9a224d4a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment