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)
commit65ecc861cbd0ac515497f8eaca382fcbbb38ca7b
treec6e4d9974bc532211ec2daafd25d5834878b1b5d
parenta2ac43c452b96f866cbc440edbfdbb980a3b2166
parent333bb37f148228d3cfb9c9326af37c1a339a128f
Merge \\"Reset debug message callback if exception is thrown\\" into nyc-dev am: b96fd36e8c
am: 333bb37f14

Change-Id: Ibfc3ba270338091b2d0968f8c077ac34296e1932