tree 96ad59203bd297de4b3ad64795ee898f46cad6d8
parent ed1b89878bdf1fa9b5e4b2dfc766383d531d4315
parent 7c4c87bd73c73b167d5cd989c52d3c26124314dc
author Chris Wren <cwren@android.com> 1458075837 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458075839 +0000

Merge "fix NPE when dump wins the race against emit" into nyc-dev