diff options
author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-03 21:25:23 +0200 |
---|---|---|
committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-03 21:25:23 +0200 |
commit | 2a8b3a06026758f08062c68041a6fe194e982aa9 (patch) | |
tree | bc044cf8098a8cd0fa43f07dd65925035c75e731 /device.mk | |
parent | 7c2f80683a3c22a26be6e9ccc535cf6045b380da (diff) | |
parent | e9df5ccf43ebac547647921965968781ef3980b4 (diff) | |
download | device_samsung_tuna-2a8b3a06026758f08062c68041a6fe194e982aa9.zip device_samsung_tuna-2a8b3a06026758f08062c68041a6fe194e982aa9.tar.gz device_samsung_tuna-2a8b3a06026758f08062c68041a6fe194e982aa9.tar.bz2 |
Merge remote branch 'remotes/google/master' into HEAD
Conflicts:
kernel
Diffstat (limited to 'device.mk')
-rw-r--r-- | device.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -99,7 +99,9 @@ PRODUCT_PACKAGES += \ # Key maps PRODUCT_COPY_FILES += \ device/samsung/tuna/tuna-gpio-keypad.kl:system/usr/keylayout/tuna-gpio-keypad.kl \ - device/samsung/tuna/tuna-gpio-keypad.kcm:system/usr/keychars/tuna-gpio-keypad.kcm + device/samsung/tuna/tuna-gpio-keypad.kcm:system/usr/keychars/tuna-gpio-keypad.kcm \ + device/samsung/tuna/sec_jack.kl:system/usr/keylayout/sec_jack.kl \ + device/samsung/tuna/sec_jack.kcm:system/usr/keychars/sec_jack.kcm # Input device calibration files PRODUCT_COPY_FILES += \ |