commit 3c2236ce54827b18fa918e5bb098d4c7bf9f2a02
author Brian Carlstrom <bdc@google.com> Fri May 23 08:34:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 23 08:34:56 2014 +0000
tree 79486061d421641c82b6eb51e8fe4ea6f8a00317
parent c6091349140695d1ee1bdac6d0e581ef3cf134e0
parent 641fc51b39b6cdeec68ec68ed766185f30a6c3ab

am 641fc51b: am bba4d1ca: Merge "Remove libdvm VMRuntime.vmFlags"

* commit '641fc51b39b6cdeec68ec68ed766185f30a6c3ab':
  Remove libdvm VMRuntime.vmFlags

libdvm/src/main/java/dalvik/system/VMRuntime.java

diff --git a/libdvm/src/main/java/dalvik/system/VMRuntime.java b/libdvm/src/main/java/dalvik/system/VMRuntime.java
index 0b0fdc2..1d58d8d 100644
--- a/libdvm/src/main/java/dalvik/system/VMRuntime.java
+++ b/libdvm/src/main/java/dalvik/system/VMRuntime.java
@@ -94,13 +94,6 @@
     }
 
     /**
-     * Returns the VM's internal flags.
-     */
-    public String vmFlags() {
-        return "";
-    }
-
-    /**
      * Returns whether the VM is running in 64-bit mode.
      */
     public boolean is64Bit() {