From 0a7d65dfe662e01cf8932949ff72e20ecf374d98 Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <skate4life@gmx.de>
Date: Wed, 12 Aug 2015 22:30:34 +0200
Subject: P51xx: fix missmerge

Remove dock_keyboard,
common aosp overlay get added from espresso-common repo

Change-Id: I5da13bdf71e3096eaf36859c9c900e8a995f80f2
---
 dock_keyboard/Android.mk | 11 -----------
 p51xx-common.mk          |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 dock_keyboard/Android.mk

diff --git a/dock_keyboard/Android.mk b/dock_keyboard/Android.mk
deleted file mode 100644
index 13958bd..0000000
--- a/dock_keyboard/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= dock_keyboard_attach.c
-LOCAL_MODULE:= dock_kbd_attach
-LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += $(KERNEL_HEADERS)
-LOCAL_SHARED_LIBRARIES += libutils libcutils
-
-include $(BUILD_EXECUTABLE)
diff --git a/p51xx-common.mk b/p51xx-common.mk
index 30e8550..b888359 100755
--- a/p51xx-common.mk
+++ b/p51xx-common.mk
@@ -17,8 +17,6 @@
 # Include espresso-common makefile
 $(call inherit-product, device/samsung/espresso-common/espresso-common.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso-common/overlay/aosp-common
-
 LOCAL_PATH := device/samsung/p5100
 
 # Enable higher-res drawables while keeping mdpi as primary source
-- 
cgit v1.1