tree 73cab439d7f6079f98a263c6acac3cc375962a2b
parent 4ddce844567e0b7ccb8a50706df8cddaba09ce86
parent 390786a2045a71f9e117840dfdb88b4ba342fe58
author Mathias Agopian <mathias@google.com> 1496773139 +0000
committer android-build-merger <android-build-merger@google.com> 1496773139 +0000

fix race condition that can cause a use after free am: 59485525a6 am: 5da64c91d0 am: 46361c6c2b am: ee464e00d3 am: 21e9397776  -s ours am: 1b81145396
am: 390786a204

Change-Id: I606f740ad26e0b415149a657adfe6c2dd879c139