Merge branch 'gingerbread' into gingerbread-release

apps/Development/src/com/android/development/BadBehaviorActivity.java

@@ -100,6 +100,10 @@ public class BadBehaviorActivity extends Activity {
             return true;
         }
 
+        public int appEarlyNotResponding(String processName, int pid, String annotation) {
+            return 0;
+        }
+
         public int appNotResponding(String proc, int pid, String st) {
             return 0;
         }

cmds/monkey/src/com/android/commands/monkey/Monkey.java

@@ -291,6 +291,10 @@ public class Monkey {
             return false;
         }
 
+        public int appEarlyNotResponding(String processName, int pid, String annotation) {
+            return 0;
+        }
+
         public int appNotResponding(String processName, int pid, String processStats) {
             int savedPolicy = StrictMode.allowThreadDiskWrites();
             System.err.println("// NOT RESPONDING: " + processName + " (pid " + pid + ")");