summaryrefslogtreecommitdiff
path: root/core/java/android/util/TimeUtils.java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-06-16 10:03:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-16 10:03:19 +0000
commit5af1edc4bbcd8ece7d9c1d270ffc0a4e7d44dc4f (patch)
treea03a5769bc9596d562857c72ed2ca7a9ea78aa7a /core/java/android/util/TimeUtils.java
parent2fbe7373188445b1eef60a97786e03319af6dca2 (diff)
parent5a44bdc828cba61aa055e2d71b3af62f39100179 (diff)
am 5a44bdc8: am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."
* commit '5a44bdc828cba61aa055e2d71b3af62f39100179': Remove some pointless code.
Diffstat (limited to 'core/java/android/util/TimeUtils.java')
-rw-r--r--core/java/android/util/TimeUtils.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java
index 8f4b710b9a70..f7d2821888ec 100644
--- a/core/java/android/util/TimeUtils.java
+++ b/core/java/android/util/TimeUtils.java
@@ -62,10 +62,7 @@ public class TimeUtils {
*/
public static TimeZone getTimeZone(int offset, boolean dst, long when, String country) {
TimeZone best = null;
-
- Resources r = Resources.getSystem();
- XmlResourceParser parser = r.getXml(com.android.internal.R.xml.time_zones_by_country);
- Date d = new Date(when);
+ final Date d = new Date(when);
TimeZone current = TimeZone.getDefault();
String currentName = current.getID();