Merge \\"Reset debug message callback if exception is thrown\\" into nyc-dev am:...
authorMika Isojarvi <misojarvi@google.com>
Mon, 13 Jun 2016 23:00:52 +0000 (23:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 23:00:52 +0000 (23:00 +0000)
am: 400f824feb

Change-Id: Ifc05106c8358fb770fe03b7d818d3c7d386fd740


Trivial merge