summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2014-02-27 23:41:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-27 23:41:38 +0000
commit5ea4be5214363a52cf211041fa3b4ffacc36187a (patch)
treecfd04c57578df1aedc3d1005fbee3cc8fdc65def /tools
parent667387fc1346932c6f5602aaaff2d771a1240fee (diff)
parentb2334254ef497e0dcda68d257c096516c77679a4 (diff)
downloadframeworks_base-5ea4be5214363a52cf211041fa3b4ffacc36187a.zip
frameworks_base-5ea4be5214363a52cf211041fa3b4ffacc36187a.tar.gz
frameworks_base-5ea4be5214363a52cf211041fa3b4ffacc36187a.tar.bz2
am b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit 'b2334254ef497e0dcda68d257c096516c77679a4': 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