tree eef5a1ed52ff1461feed5b3edb61dd71944d6750
parent 99a31b8129b71aeeb08b3c33a39b0f7f97e74852
author Paul Lawrence <paullawrence@google.com> 1412864569 +0000
committer Paul Lawrence <paullawrence@google.com> 1412870736 -0700

Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""

This reverts commit 99a31b8129b71aeeb08b3c33a39b0f7f97e74852.

Fixed build error, and also fixed memory leak spotted from warning.

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981