resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp

Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac
2011-01-24 23:45:43 -08:00
parent 8ae584edb2 42f87e1b47
commit 902bc7bcea
1 changed files with 2 additions and 1 deletions
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -337,8 +337,9 @@ public class Monkey {
                synchronized (Monkey.this) {
                    mAbort = true;
                }
+                return (mKillProcessAfterError) ? -1 : 0;
            }
-            return (mKillProcessAfterError) ? -1 : 1;
+            return 0;
        }
    }