tree bca4205f3324d7480fb3ce021e285c23508040ea
parent a56b5aff832c4fd825d78a0e5706298277479315
parent cca2aa64c2d6a5140fe96e505df347255a9f0977
author Dimitry Ivanov <dimitry@google.com> 1478640524 +0000
committer android-build-merger <android-build-merger@google.com> 1478640524 +0000

Merge "Eliminate deadlock in forked child due to delayed resetting mutex lock" am: 8bfaac0f8a am: 7676c3494a am: 36fac159ed
am: cca2aa64c2

Change-Id: If4be2b6b42987a2b639822196e72d6f707e94763