tree 2a1d818644aae498b3440e4f12b6b71a9b94732e
parent 6a7200333aa2c7f2abbdfba79fb2ca708db0743e
parent ee464e00d3db7b16eb6b75932665f8ccc732d013
author Mathias Agopian <mathias@google.com> 1496771190 +0000
committer android-build-merger <android-build-merger@google.com> 1496771190 +0000

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

Change-Id: Ifb22956eadae06f2ff6b0445d5e92e450c947942