config: move AdvancedDisplay into hardware/samsung

Change-Id: I69794826a2b9969290b81f966729ce7cfaa8e367
diff --git a/config/cm-13.0.yaml b/config/cm-13.0.yaml
index 04dea95..361e33d 100644
--- a/config/cm-13.0.yaml
+++ b/config/cm-13.0.yaml
@@ -756,16 +756,6 @@
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
-  # samsung galaxys2-common AdvancedDisplay
-  -
-    source:      '/device/samsung/galaxys2-common/AdvancedDisplay/res/values/arrays.xml'
-    translation: '/%original_path%-%android_code%/%original_file_name%'
-    languages_mapping: *anchor
-  -
-    source:      '/device/samsung/galaxys2-common/AdvancedDisplay/res/values/strings.xml'
-    translation: '/%original_path%-%android_code%/%original_file_name%'
-    languages_mapping: *anchor
-
   # samsung qcom-common doze
   -
     source:      '/device/samsung/qcom-common/doze/res/values/strings.xml'
@@ -777,3 +767,13 @@
     source:      '/device/yu/sambar/configpanel/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
+
+  # samsung exynos4 AdvancedDisplay
+  -
+    source:      '/hardware/samsung/exynos4/AdvancedDisplay/res/values/arrays.xml'
+    translation: '/%original_path%-%android_code%/%original_file_name%'
+    languages_mapping: *anchor
+  -
+    source:      '/hardware/samsung/exynos4/AdvancedDisplay/res/values/strings.xml'
+    translation: '/%original_path%-%android_code%/%original_file_name%'
+    languages_mapping: *anchor
diff --git a/config/cm-13.0_extra_packages.xml b/config/cm-13.0_extra_packages.xml
index fc8042b..9d1e090 100644
--- a/config/cm-13.0_extra_packages.xml
+++ b/config/cm-13.0_extra_packages.xml
@@ -36,7 +36,8 @@
   <project path="device/motorola/victara" name="CyanogenMod/android_device_motorola_victara" />
   <project path="device/motorola/xt897" name="CyanogenMod/android_device_motorola_xt897" />
   <project path="device/oppo/common" name="CyanogenMod/android_device_oppo_common" />
-  <project path="device/samsung/galaxys2-common" name="CyanogenMod/android_device_samsung_galaxys2-common" />
   <project path="device/samsung/qcom-common" name="CyanogenMod/android_device_samsung_qcom-common" />
   <project path="device/yu/sambar" name="CyanogenMod/android_device_yu_sambar" />
+
+  <project path="hardware/samsung" name="CyanogenMod/android_hardware_samsung" />
 </manifest>