commit ec84ada6e8f3dad738810e2f1cd085defbc6d0ab
author Xavier Ducrohet <xav@android.com> Thu Feb 27 23:34:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 27 23:34:34 2014 +0000
tree d78b904f6b31fb5c9f03e7e35664601c0ce3bf0b
parent 43e412cb67ad47c5c9d68ac8cbd12356aca97603
parent 5e5602da5fa9cd2e1d135b2310af2a8352f65e8d

am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"

* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock

tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java

diff --git a/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java b/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java
index fd594f7..5f0d98b 100644
--- a/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java
@@ -33,11 +33,6 @@
     private static long sBootTime = System.currentTimeMillis();
     private static long sBootTimeNano = System.nanoTime();
 
-    @LayoutlibDelegate
-    /*package*/ static boolean setCurrentTimeMillis(long millis) {
-        return true;
-    }
-
     /**
      * Returns milliseconds since boot, not counting time spent in deep sleep.
      * <b>Note:</b> This value may get reset occasionally (before it would