Merge "Reset debug message callback if exception is thrown" into nyc-dev
authorMika Isojarvi <misojarvi@google.com>
Mon, 13 Jun 2016 22:26:39 +0000 (22:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 13 Jun 2016 22:26:40 +0000 (22:26 +0000)

Trivial merge