Merge "prebuilts: Add SoundPickerPrebuilt" into q10
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 7838954..b2287f8 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -63,7 +63,8 @@
Dialer \
OmniJaws \
WeatherIcons \
- OmniStyle
+ OmniStyle \
+ SoundPickerPrebuilt
ifeq ($(TARGET_USES_LAWNCHAIR),true)
PRODUCT_PACKAGES += \
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 3c30825..3af04d7 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -141,3 +141,13 @@
LOCAL_PRODUCT_MODULE := true
LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := SoundPickerPrebuilt
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
diff --git a/prebuilt/common/app/SoundPickerPrebuilt.apk b/prebuilt/common/app/SoundPickerPrebuilt.apk
new file mode 100644
index 0000000..8b48911
--- /dev/null
+++ b/prebuilt/common/app/SoundPickerPrebuilt.apk
Binary files differ