Merge remote-tracking branch 'github/master' into internal.

Stewart Miles · Stewart Miles · commit debcf7be5ef1 · 2017-01-30T14:20:49.000-08:00
Change-Id: Id812cdd5464aa1023b714b4beb5781e116981e44
diff --git a/source/JarResolverLib/src/Google.JarResolver/PlayServicesSupport.cs b/source/JarResolverLib/src/Google.JarResolver/PlayServicesSupport.cs
@@ -109,7 +109,7 @@ private static string SDKInternal
                     sdk = UnityEditor.EditorPrefs.GetString("AndroidSdkRoot");
                 }
 #endif  // UNITY_EDITOR
-                if (String.IsNullOrEmpty(sdk)) {
+                if (string.IsNullOrEmpty(sdk)) {
                     sdk = System.Environment.GetEnvironmentVariable("ANDROID_HOME");
                 }
                 return sdk;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private static string SDKInternal`
`109`	`109`	`sdk = UnityEditor.EditorPrefs.GetString("AndroidSdkRoot");`
`110`	`110`	`}`
`111`	`111`	`#endif // UNITY_EDITOR`
`112`		`- if (String.IsNullOrEmpty(sdk)) {`
	`112`	`+ if (string.IsNullOrEmpty(sdk)) {`
`113`	`113`	`sdk = System.Environment.GetEnvironmentVariable("ANDROID_HOME");`
`114`	`114`	`}`
`115`	`115`	`return sdk;`