am c3d8790d: Merge "Remove misleading documentation from SystemClock" into jb-mr2-dev

* commit 'c3d8790d53d23c4d9d3b9557d5811fde66ab791c': Remove misleading documentation from SystemClock
2013-03-26 13:17:16 -07:00
parent 6b749cd07a c3d8790d53
commit 1426be82b4
1 changed files with 0 additions and 2 deletions
--- a/core/java/android/os/SystemClock.java
+++ b/core/java/android/os/SystemClock.java
@@ -138,8 +138,6 @@ public final class SystemClock {

    /**
     * Returns milliseconds since boot, not counting time spent in deep sleep.
-     * <b>Note:</b> This value may get reset occasionally (before it would
-     * otherwise wrap around).
     *
     * @return milliseconds of non-sleep uptime since boot.
     */