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:55 +0000 (23:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 23:55:55 +0000 (23:55 +0000)
commit5e3f67982f77ef5dc228a747332073ee65d22bd0
tree915cad376f481d73468976cb6ba4d559de8302e0
parent8d0fe4eaecff653d26ad893af0580c644199e7b6
parent2b9bd02303f80bb3d771a80d39fa5d04c2ed35f4
Merge \\\"Reset debug message callback if exception is thrown\\\" into nyc-dev am: b96fd36e8c am: 400f824feb
am: 2b9bd02303

Change-Id: I8ab121297a27973196d7a67185a9430dd2d5bf22