tree 39193cdae936d3c37662b2d14ee93de01f8d89f0
parent 7f61163340f678b5e2d39466a1f3ca0e54d4fb8c
author Svetoslav Ganov <svetoslavganov@google.com> 1489023155 -0800
committer Svetoslav Ganov <svetoslavganov@google.com> 1489023162 -0800

Avoid cross lock acquisition leading to deadlocks

Test: manual

bug:36007738

Change-Id: I3db09af07857435682754916849433a809547974