summaryrefslogtreecommitdiff
path: root/android/src
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-08-03 18:45:36 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-08-03 18:45:36 +0000
commitd0aa6f6e42a8ff80e71b676efb6240446e41d697 (patch)
tree337714088474ed889715a0c7d14da438eae5b36a /android/src
parent6781757dcb88c1d7ef1c910f2aeccc9460d47ff4 (diff)
parent240238f18856f672972485437551a91991ff4cf9 (diff)
downloadidea-d0aa6f6e42a8ff80e71b676efb6240446e41d697.tar.gz
Merge "Fixing creation of wear AVDs on windows" into studio-1.3-dev
automerge: 240238f * commit '240238f18856f672972485437551a91991ff4cf9': Fixing creation of wear AVDs on windows
Diffstat (limited to 'android/src')
-rwxr-xr-xandroid/src/com/android/tools/idea/avdmanager/AvdEditWizard.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/src/com/android/tools/idea/avdmanager/AvdEditWizard.java b/android/src/com/android/tools/idea/avdmanager/AvdEditWizard.java
index 22ff0cc4e71..24513d3c20f 100755
--- a/android/src/com/android/tools/idea/avdmanager/AvdEditWizard.java
+++ b/android/src/com/android/tools/idea/avdmanager/AvdEditWizard.java
@@ -414,7 +414,7 @@ public class AvdEditWizard extends DynamicWizard {
if (image != null) {
File[] skins = image.getSkins();
for (File skin : skins) {
- if (skin.getPath().endsWith("/" + path.getPath())) {
+ if (skin.getPath().endsWith(File.separator + path.getPath())) {
return skin;
}
}