Imported Upstream version 3.8.0

Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
2014-09-04 09:07:35 +01:00
parent a575963da9
commit fe777c5c82
1062 changed files with 12460 additions and 5983 deletions
--- a/mcs/class/corlib/System/TimeZone.cs
+++ b/mcs/class/corlib/System/TimeZone.cs
@@ -73,7 +73,11 @@ namespace System
 				
 				lock (tz_lock) {
 					if (tz == null || Math.Abs (now - timezone_check) > TimeSpan.TicksPerMinute) {
-						tz = new CurrentSystemTimeZone (now);
+#if MONODROID
+						tz = AndroidPlatform.GetCurrentSystemTimeZone ();
+						if (tz == null)
+#endif
+							tz = new CurrentSystemTimeZone (now);
 						timezone_check = now;

 						currentTimeZone = tz;