tree bca4205f3324d7480fb3ce021e285c23508040ea
parent df8bccafdc875574f055c0a4a76bb3f588ac9f54
parent 8bfaac0f8ad5f280d1f893fe682e007dd0820692
author Dimitry Ivanov <dimitry@google.com> 1478639624 +0000
committer android-build-merger <android-build-merger@google.com> 1478639624 +0000

Merge "Eliminate deadlock in forked child due to delayed resetting mutex lock"
am: 8bfaac0f8a

Change-Id: I7db0e466f3ea8af90fe9ec7c103ec3ddff3a7da9