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

* commit '7cf8e1cb88c44963ccb2128113d8a804d85645b9':
  Skip the "--abi" flag on "adb install" if present.
This commit is contained in:
Narayan Kamath 2014-06-03 13:58:44 +00:00 committed by Android Git Automerger
commit 8f4ac8e1d3
1 changed files with 2 additions and 0 deletions

View File

@ -1796,6 +1796,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++;
}
}