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

Change-Id: Ide69b6972eba683116a204636a9de6f60650b239


Trivial merge