diff options
| author | Philip Milne <pmilne@google.com> | 2012-09-24 11:02:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 11:02:31 -0700 |
| commit | b00df8e929f9ba865a95a7df3f949e6169332954 (patch) | |
| tree | 403858cba43361e6ca1a9a4d955929f4b671e2a0 /api | |
| parent | cd11b223f3d23ca0f92b53808f7e1cce928c2a7b (diff) | |
| parent | 2f6d8829524dfca3a77e9a57c3b9c3862209877d (diff) | |
| download | frameworks_base-b00df8e929f9ba865a95a7df3f949e6169332954.zip frameworks_base-b00df8e929f9ba865a95a7df3f949e6169332954.tar.gz frameworks_base-b00df8e929f9ba865a95a7df3f949e6169332954.tar.bz2 | |
Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 5e472ac..2b9bf65 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16565,7 +16565,7 @@ package android.os { public final class SystemClock { method public static long currentThreadTimeMillis(); method public static long elapsedRealtime(); - method public static long elapsedRealtimeNano(); + method public static long elapsedRealtimeNanos(); method public static boolean setCurrentTimeMillis(long); method public static void sleep(long); method public static long uptimeMillis(); |