commit 2598f0ad55044c92553e45a5d46ee7e91ba4a7fe
author Elliott Hughes <enh@google.com> Tue Dec 09 18:28:05 2014 -0800
committer Elliott Hughes <enh@google.com> Tue Dec 09 18:28:05 2014 -0800
tree 5afe679fb712b0168db0d8c426c95ecc3b069d74
parent a5f2da5012f06184b1c4633e4b1c3e38fd201a19
parent 02ef15f1d7cc6f47b041eb34e7d9d2ef37ff866d

resolved conflicts for merge of 02ef15f1 to lmp-mr1-dev-plus-aosp

Change-Id: If44376782436b92c2d03a56df57572fc964158a9

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index 903b818..06c94db 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -190,7 +190,6 @@
         "\n"
         "  adb restore <file>           - restore device contents from the <file> backup archive\n"
         "\n"
-        "  adb disable-verity           - disable dm-verity checking on USERDEBUG builds\n"
         "  adb keygen <file>            - generate adb public/private key. The private key is stored in <file>,\n"
         "                                 and the public key is stored in <file>.pub. Any existing files\n"
         "                                 are overwritten.\n"