tree 505ac8974e6a1801a34de0ac4f0f22b812df24b1
parent 847370ce61c08eefc1ada78339c2d112bb36c720
parent 27912dfd866f2631803a35c1ec47b6f31f8d2054
author Jorim Jaggi <jjaggi@google.com> 1440804351 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440804351 +0000

am 27912dfd: am e6b0282a: am a2681383: am acace94c: Fix race condition by guarding callbacks

* commit '27912dfd866f2631803a35c1ec47b6f31f8d2054':
  Fix race condition by guarding callbacks