Merge \"Reset debug message callback if exception is thrown\" into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Mon, 13 Jun 2016 22:34:00 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:34:00 +0000 (22:34 +0000)
commit333bb37f148228d3cfb9c9326af37c1a339a128f
treec6e4d9974bc532211ec2daafd25d5834878b1b5d
parentb4a802deb38d2e1b99921f03e24470bd52161ed0
parentb96fd36e8c6b1808149ca292d8732669c545b890
Merge \"Reset debug message callback if exception is thrown\" into nyc-dev
am: b96fd36e8c

Change-Id: I2c9074fbe572278066968faa1314e5f45bb31860