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:55 +0000 (23:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 23:55:55 +0000 (23:55 +0000)
am: 2b9bd02303

Change-Id: I8ab121297a27973196d7a67185a9430dd2d5bf22


Trivial merge