| commit | 8f4ac8e1d3349170f319526e8cfcb036db954ee4 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jun 03 13:58:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 13:58:44 2014 +0000 |
| tree | cc442dd0719e5479b80e6c0f459ca9916a2455f0 | |
| parent | 9e18975bac792fc4b0b18d7f679772c577fbd56f [diff] | |
| parent | 7cf8e1cb88c44963ccb2128113d8a804d85645b9 [diff] |
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.
diff --git a/adb/commandline.c b/adb/commandline.c index bfc7cf8..4f2d40f 100644 --- a/adb/commandline.c +++ b/adb/commandline.c
@@ -1796,6 +1796,8 @@ } else if (!strcmp(argv[i], "--key")) { verify_apk = 0; i++; + } else if (!strcmp(argv[i], "--abi")) { + i++; } }