summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2014-02-27 23:34:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-27 23:34:34 +0000
commitec84ada6e8f3dad738810e2f1cd085defbc6d0ab (patch)
treed78b904f6b31fb5c9f03e7e35664601c0ce3bf0b /tools
parent43e412cb67ad47c5c9d68ac8cbd12356aca97603 (diff)
parent5e5602da5fa9cd2e1d135b2310af2a8352f65e8d (diff)
downloadframeworks_base-ec84ada6e8f3dad738810e2f1cd085defbc6d0ab.zip
frameworks_base-ec84ada6e8f3dad738810e2f1cd085defbc6d0ab.tar.gz
frameworks_base-ec84ada6e8f3dad738810e2f1cd085defbc6d0ab.tar.bz2
am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d': Update layoutlib method for SystemClock
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java5
1 files changed, 0 insertions, 5 deletions
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 @@ public class SystemClock_Delegate {
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