Merge \\\"Reset debug message callback if exception is thrown\\\" into nyc-dev am...
authorMika Isojärvi <misojarvi@google.com>
Mon, 13 Jun 2016 23:55:26 +0000 (23:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 23:55:26 +0000 (23:55 +0000)
commit8265166ae6929804943be2a125e65363b2cdb5ab
tree915cad376f481d73468976cb6ba4d559de8302e0
parent5c976d75f530444796f94abd6a1348c153620b54
parent65ecc861cbd0ac515497f8eaca382fcbbb38ca7b
Merge \\\"Reset debug message callback if exception is thrown\\\" into nyc-dev am: b96fd36e8c am: 333bb37f14
am: 65ecc861cb

Change-Id: If87f3b1c4b3de9f4025da0839df781305a5e54c7