SDK: use repository-N.xml by default. Do not merge.

(This is part of Change I566b6945 but I had forgotten
to amend & upload, grrr.)

(cherry picked from commit 46b86398f7287cbdc88a15f9f6a2418ba29a7dbc)

Change-Id: I71ad810ac2ddbd11ece7f8e5afea22740a52100f

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
index ac292c3..2dd3b4e 100755 (executable)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
@@ -344,10 +344,12 @@ public class UpdaterData implements IUpdaterData {
             for (String url : urls) {\r
                 if (url != null) {\r
                     url = url.trim();\r
-                    if (url.endsWith("/") || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME)) {\r
+                    if (url.endsWith("/")\r
+                            || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME)\r
+                            || url.endsWith(SdkRepoConstants.URL_DEFAULT_FILENAME2)) {\r
                         String fullUrl = url;\r
                         if (fullUrl.endsWith("/")) {\r
-                            fullUrl += SdkRepoConstants.URL_DEFAULT_FILENAME;\r
+                            fullUrl += SdkRepoConstants.URL_DEFAULT_FILENAME2;\r
                         }\r
 \r
                         SdkSource s = new SdkRepoSource(fullUrl, null/*uiName*/);\r