Merge "Fix a crash when parsing fastboot command-line arguments" am: 517f6d476e am: 1c1ee87e35

am: 7534be53c3

Change-Id: I0efbcbb2542676e9310752d10c208704c46ca22d
This commit is contained in:
Pavlin Radoslavov 2017-01-26 07:35:44 +00:00 committed by android-build-merger
commit 6fb5a6354c

View file

@ -1648,8 +1648,7 @@ int main(int argc, char **argv)
wants_reboot = false;
wants_reboot_bootloader = true;
skip(1);
}
if (!strcmp(*argv, "emergency")) {
} else if (!strcmp(*argv, "emergency")) {
wants_reboot = false;
wants_reboot_emergency = true;
skip(1);