am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."

* commit '4e26c95a6363da4885bb9178c9d42c273b357043':
  Skip the "--abi" flag on "adb install" if present.
This commit is contained in:
Narayan Kamath 2014-06-03 13:29:03 +00:00 committed by Android Git Automerger
commit 7cf8e1cb88

View file

@ -1744,6 +1744,8 @@ int install_app(transport_type transport, char* serial, int argc, char** argv)
} else if (!strcmp(argv[i], "--key")) {
verify_apk = 0;
i++;
} else if (!strcmp(argv[i], "--abi")) {
i++;
}
}