summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Baker-Malone <jbakermalone@google.com>2014-10-17 07:59:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-17 07:59:48 +0000
commita21bfd723c4e39906760bf6bffbc78185d54b4f2 (patch)
tree495350f532ac81af188d65f9b1117669450e2ff2
parent8079a1931211e9bc8e9e82bf040d016679fb7c50 (diff)
parenteacc46b84fa1eaecc8b6c8a3f0637cd6e4f5433f (diff)
downloadbase-a21bfd723c4e39906760bf6bffbc78185d54b4f2.tar.gz
Merge "Add skin def for nexus 6 and 9" into studio-1.0-dev
automerge: eacc46b * commit 'eacc46b84fa1eaecc8b6c8a3f0637cd6e4f5433f': Add skin def for nexus 6 and 9
-rw-r--r--sdklib/src/main/java/com/android/sdklib/devices/nexus.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/sdklib/src/main/java/com/android/sdklib/devices/nexus.xml b/sdklib/src/main/java/com/android/sdklib/devices/nexus.xml
index 73aad41da6..004439aaf2 100644
--- a/sdklib/src/main/java/com/android/sdklib/devices/nexus.xml
+++ b/sdklib/src/main/java/com/android/sdklib/devices/nexus.xml
@@ -862,6 +862,7 @@
</d:abi>
<d:dock> </d:dock>
<d:power-type>battery</d:power-type>
+ <d:skin>nexus_6</d:skin>
</d:hardware>
<d:software>
<d:api-level>21</d:api-level>
@@ -979,6 +980,7 @@
</d:abi>
<d:dock> </d:dock>
<d:power-type>battery</d:power-type>
+ <d:skin>nexus_9</d:skin>
</d:hardware>
<d:software>
<d:api-level>21</d:api-level>