LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac
This commit is contained in:
The Android Automerger
2011-01-24 23:45:43 -08:00
parent 8ae584edb2 42f87e1b47
commit 902bc7bcea
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/monkey/src/com/android/commands/monkey/Monkey.java
View File

@@ -337,8 +337,9 @@ public class Monkey {
synchronized (Monkey.this) { synchronized (Monkey.this) {
mAbort = true; mAbort = true;
} }
return (mKillProcessAfterError) ? -1 : 0;
} }
return (mKillProcessAfterError) ? -1 : 1; return 0;
} }
} }