commit 9deaf24c3d38214a832d3a79aa8a128b98912cee
author Joe Baker-Malone <jbakermalone@google.com> Wed Jul 15 17:50:58 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 15 17:50:58 2015 +0000
tree 621124f0ce2aad7fff1652aba05bb07c0da450b4
parent a724ba276b41cfca548488f3aaa0f49838763c5b
parent a04c81f2396d6fc2b93c8b77acd8985923959c22

Merge "Add hardware-properties.ini for windows" into studio-1.4-dev
automerge: a04c81f

* commit 'a04c81f2396d6fc2b93c8b77acd8985923959c22':
  Add hardware-properties.ini for windows

build.gradle

diff --git a/build.gradle b/build.gradle
index fcef928..cb0b81a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,6 @@
             into 'lib'
             notice null
         }
-
         item("$buildDefaultEmulator.output/emulator") {
             executable true
             builtBy buildDefaultEmulator
@@ -93,6 +92,10 @@
     }
 
     windows {
+        item('android/avd/hardware-properties.ini') {
+            into 'lib'
+            notice null
+        }
         item("$buildWindowsEmulator.output/emulator.exe") {
             builtBy buildWindowsEmulator
         }