OSDN Git Service

Merge "fix race condition that can cause a use after free" into oc-dev
authorMathias Agopian <mathias@google.com>
Tue, 4 Apr 2017 21:51:01 +0000 (21:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Apr 2017 21:51:01 +0000 (21:51 +0000)

Trivial merge