commit 4d3f581d872ff1634b772411a66dab5ba9c6bebe
author David 'Digit' Turner <digit@google.com> Mon Aug 25 16:14:02 2014 +0200
committer David 'Digit' Turner <digit@google.com> Mon Aug 25 16:14:02 2014 +0200
tree 9d30715d2c2dabe2dd1890c882c1692ebb72f96e
parent 3cff4f39b2df9cdd84b1af1251f578d943bbdb1f
parent 7a58de4e099a896871adc763e14ed4b08d5f3fbb

resolved conflicts for merge of 7a58de4e to lmp-dev-plus-aosp

Change-Id: I74491684909c34022c20932e1acd57887b1f0c15

target/product/sdk_phone_arm64.mk

diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk
index c501f14..a0cf6c1 100644
--- a/target/product/sdk_phone_arm64.mk
+++ b/target/product/sdk_phone_arm64.mk
@@ -21,6 +21,7 @@
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
 
 # Overrides
 PRODUCT_BRAND := generic_arm64