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)
am: b96fd36e8c

Change-Id: I2c9074fbe572278066968faa1314e5f45bb31860


Trivial merge