tree 4e105447943b41b5718f7abcc6207dfab7b84a86
parent fd4f05ce058cfff745c1edbe06d0703cc4a2954d
parent 152d2d4234ba89e0c20c4af13e291b6049a7bc33
author Nick Kralevich <nnk@google.com> 1412812739 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1412812740 +0000

Merge "Revert "Enable verity on userdebug, and add disable-verity to adb"" into lmp-mr1-dev