Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2598f0ad authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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

Change-Id: If44376782436b92c2d03a56df57572fc964158a9
parents a5f2da50 02ef15f1

adb/commandline.c

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ void help() 
        "\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"