Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
2015-08-26 07:17:56 -04:00
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
--- a/mcs/class/corlib/System.Reflection/AssemblyName.cs
+++ b/mcs/class/corlib/System.Reflection/AssemblyName.cs
@@ -431,11 +431,7 @@ namespace System.Reflection {

 		public string CultureName {
 			get {
-				if (cultureinfo == null)
-					return null;
-				if (cultureinfo.LCID == CultureInfo.InvariantCulture.LCID)
-					return "neutral";
-				return cultureinfo.Name;
+				return (cultureinfo == null)? null : cultureinfo.Name;
 			}
 		}