summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-04-26 18:41:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-04-26 18:41:47 +0000
commit0bb497b8d1bac2206df89a878ecb7e356d21fe99 (patch)
treecd539fad1ebc68f95301093bf2f9975103020300 /core
parentb0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe (diff)
parent48289433d878d679ecae0cd7d74371d6440285e3 (diff)
downloadframeworks_base-0bb497b8d1bac2206df89a878ecb7e356d21fe99.zip
frameworks_base-0bb497b8d1bac2206df89a878ecb7e356d21fe99.tar.gz
frameworks_base-0bb497b8d1bac2206df89a878ecb7e356d21fe99.tar.bz2
Merge "Use the newer ZoneInfoDB API."
Diffstat (limited to 'core')
-rw-r--r--core/java/android/util/TimeUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java
index 5a4f322..33964a0 100644
--- a/core/java/android/util/TimeUtils.java
+++ b/core/java/android/util/TimeUtils.java
@@ -235,7 +235,7 @@ public class TimeUtils {
* during the lifetime of an activity.
*/
public static String getTimeZoneDatabaseVersion() {
- return ZoneInfoDB.getVersion();
+ return ZoneInfoDB.getInstance().getVersion();
}
/** @hide Field length that can hold 999 days of time */