Commit c026c52e authored by Steven Thomas's avatar Steven Thomas Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock when transitioning to vr flinger" into oc-mr1-dev

parents 17209ec9 be6cbae3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment