| commit | 7cf8e1cb88c44963ccb2128113d8a804d85645b9 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jun 03 13:29:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 13:29:03 2014 +0000 |
| tree | 9daa41df621b9304b8ff60f8ab16cdd72146a9e2 | |
| parent | c99dd0c58d2a7572740599f81b5a20ddb18dbf9e [diff] | |
| parent | 4e26c95a6363da4885bb9178c9d42c273b357043 [diff] |
am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present." * commit '4e26c95a6363da4885bb9178c9d42c273b357043': Skip the "--abi" flag on "adb install" if present.
diff --git a/adb/commandline.c b/adb/commandline.c index 9ec551b..2e4cd37 100644 --- a/adb/commandline.c +++ b/adb/commandline.c
@@ -1744,6 +1744,8 @@ } else if (!strcmp(argv[i], "--key")) { verify_apk = 0; i++; + } else if (!strcmp(argv[i], "--abi")) { + i++; } }