tree e63135547da3bbf133efbcc1361ff9c4b8e73978
parent 3470e3e3f70fee0d31c103f3fae9c95f1d5ff84f
parent 21e9397776d41f6fec16bf6a35d7ce9ec5949559
author Mathias Agopian <mathias@google.com> 1496771581 +0000
committer android-build-merger <android-build-merger@google.com> 1496771581 +0000

fix race condition that can cause a use after free am: 59485525a6 am: 5da64c91d0 am: 46361c6c2b am: ee464e00d3
am: 21e9397776

Change-Id: Ifffa0ed1d960232754976ebb29b891ec99d62b75