Merge \"Reset debug message callback if exception is thrown\" into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Mon, 13 Jun 2016 22:54:16 +0000 (22:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:54:16 +0000 (22:54 +0000)
commit400f824feb62897b7d0175ee55873d752fc1ad13
treec6e4d9974bc532211ec2daafd25d5834878b1b5d
parent20c730e26c36a29a21d176d36814db9a38323ec1
parentb96fd36e8c6b1808149ca292d8732669c545b890
Merge \"Reset debug message callback if exception is thrown\" into nyc-dev
am: b96fd36e8c

Change-Id: Ide69b6972eba683116a204636a9de6f60650b239