summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-08-03 18:48:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-08-03 18:48:22 +0000
commit8dd34fa8b58935f8d3435c303f74354e7d866550 (patch)
tree058c7505c907586d200a4508d1cd9b9b61966062 /android
parent9c05160c2e6cf6fa9563410c698a51c93e97dca2 (diff)
parent118d8d5296436624bf3813927d78fac7078019e1 (diff)
downloadidea-8dd34fa8b58935f8d3435c303f74354e7d866550.tar.gz
Merge "Fixing creation of wear AVDs on windows" into studio-1.3-dev automerge: 240238f automerge: d0aa6f6
automerge: 118d8d5 * commit '118d8d5296436624bf3813927d78fac7078019e1': Fixing creation of wear AVDs on windows
Diffstat (limited to 'android')
-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;
}
}