resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp

Change-Id: I53302710ca0698daa5fe8ca3ce631a70d1578463
2010-10-07 14:59:03 -07:00
parent a3088c433e de14fbd4b1
commit cbe0d5b963
1 changed files with 1 additions and 0 deletions
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -404,6 +404,7 @@ public class Monkey {
        // Set ro.monkey if it's not set yet.
        SystemProperties.set("ro.monkey", "true");

+        // Set the process name showing in "ps" or "top"
        Process.setArgV0("com.android.commands.monkey");

        int resultCode = (new Monkey()).run(args);