Merge \\"Reset debug message callback if exception is thrown\\" into nyc-dev am:...
authorMika Isojarvi <misojarvi@google.com>
Mon, 13 Jun 2016 22:36:10 +0000 (22:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:36:10 +0000 (22:36 +0000)
am: 333bb37f14

Change-Id: Ibfc3ba270338091b2d0968f8c077ac34296e1932


Trivial merge