Commit 8f4ac8e1 authored Jun 03, 2014 by Narayan Kamath Committed by Android Git Automerger Jun 03, 2014

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

* commit '7cf8e1cb':
  Skip the "--abi" flag on "adb install" if present.

adb/commandline.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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++;
		}
		}