tree 4c5d4a710ddc4aeacba47f7c6a7d00cb6c65674c
parent 25e51b9678dd455cc712d54e80141e645b378a6c
author Haoming Zhang <haoming@haoming-macbookpro.roam.corp.google.com> 1489618097 -0700
committer Haoming Zhang <haoming@haoming-macbookpro.roam.corp.google.com> 1489618097 -0700

add lock to emitwithcallback (due to merge conflicts), address comments