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

Change-Id: If87f3b1c4b3de9f4025da0839df781305a5e54c7


Trivial merge