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)
commit2b9bd02303f80bb3d771a80d39fa5d04c2ed35f4
treec6e4d9974bc532211ec2daafd25d5834878b1b5d
parent04e0a04b3355fea3a21b5e8ab068cb3e2b8cac91
parent400f824feb62897b7d0175ee55873d752fc1ad13
Merge \\"Reset debug message callback if exception is thrown\\" into nyc-dev am: b96fd36e8c
am: 400f824feb

Change-Id: Ifc05106c8358fb770fe03b7d818d3c7d386fd740