tree 50d20668d3fb0891ccaf251f38e7273e3ad857d8
parent 7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2
author Paul Lawrence <paullawrence@google.com> 1412864569 +0000
committer Elliott Hughes <enh@google.com> 1418173337 -0800

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

This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33.

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

(cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.)

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981