auto import //branches/master/...@140412

2 files changed, 8 insertions, 2 deletions

diff --git a/dalvik/src/main/java/dalvik/system/PathClassLoader.java b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
index c80aef8..55e61a9 100644
--- a/dalvik/src/main/java/dalvik/system/PathClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
@@ -56,8 +56,8 @@ public class PathClassLoader extends ClassLoader {
     /**
      * Creates a {@code PathClassLoader} that operates on a given list of files
      * and directories. This method is equivalent to calling
-     * {@link #PathClassLoader(String, String, ClassLoader) with a {@code null}
-     * value for the second argument (see description there).
+     * {@link #PathClassLoader(String, String, ClassLoader)} with a
+     * {@code null} value for the second argument (see description there).
      * 
      * @param path
      *            the list of files and directories
diff --git a/dalvik/src/main/java/dalvik/system/VMDebug.java b/dalvik/src/main/java/dalvik/system/VMDebug.java
index 023cd6a..ee0847d 100644
--- a/dalvik/src/main/java/dalvik/system/VMDebug.java
+++ b/dalvik/src/main/java/dalvik/system/VMDebug.java
@@ -153,6 +153,12 @@ public final class VMDebug {
         int bufferSize, int flags);
 
     /**
+     * Determine whether method tracing is currently active.
+     * @hide
+     */
+    public static native boolean isMethodTracingActive();
+
+    /**
      * Stops method tracing.
      */
     public static native void stopMethodTracing();