tree bca4205f3324d7480fb3ce021e285c23508040ea
parent 3f7d3d1dc0475f278b974de26858dcc017ff3bac
parent 36fac159edfa310770572e97131b95a7e8287d03
author Dimitry Ivanov <dimitry@google.com> 1478640224 +0000
committer android-build-merger <android-build-merger@google.com> 1478640224 +0000

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

Change-Id: Iceab33584cb2ddd6c6565a7e5746dc6c4b2a76a3