Merge remote branch 'goog/honeycomb' into honeycomb-release

2011-01-20 18:24:57 -08:00
parent 09517b1345 080c237638
commit 0bd10c2d27
1 changed files with 1 additions and 2 deletions
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -337,9 +337,8 @@ public class Monkey {
                synchronized (Monkey.this) {
                    mAbort = true;
                }
-                return (mKillProcessAfterError) ? -1 : 1;
            }
-            return 1;
+            return (mKillProcessAfterError) ? -1 : 1;
        }
    }