tree 50d20668d3fb0891ccaf251f38e7273e3ad857d8
parent 7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2
parent ec900bba20630934dc51a1b3a57d6d7a30fed325
author Elliott Hughes <enh@google.com> 1418173404 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1418173405 +0000

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