commit 42461b7a59673b3567857a5ce501dd2b2fe496ba
author Mark Salyzyn <salyzyn@google.com> Mon Jul 07 18:22:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 07 18:22:43 2014 +0000
tree 3786ad3658cbb1e7a56b014f0771b3656aca31bb
parent 6ef7c14b0292a87dd3a04d243d5c7de36a0eb3da
parent 9a357b884fcc46f10f16860987614a2b9b610208

am 9a357b88: am badc23f8: am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"

* commit '9a357b884fcc46f10f16860987614a2b9b610208':
  logcat: parse failure for -n <KBsize> and -r <rotate limit>

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 16fe7ee..7c6af42 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -336,7 +336,7 @@
     for (;;) {
         int ret;
 
-        ret = getopt(argc, argv, "cdt:T:gG:sQf:r::n:v:b:BSpP:");
+        ret = getopt(argc, argv, "cdt:T:gG:sQf:r:n:v:b:BSpP:");
 
         if (ret < 0) {
             break;