commit 17b069107654c04f0ec2cc44d54da3a44006c710
author Mike Dodd <mdodd@google.com> Thu Aug 13 15:22:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 13 15:22:44 2015 +0000
tree c00b40396cf6c4812bcd15e0480b7b838310a8ec
parent 897f3ba8b1cc402fca16720be345ba9c587c326b
parent 5bf35d0685ba62ded55cc63f3dd2f23b82cc645d

am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev

* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
  Include new AOSP messaging app in base AOSP telephony builds.

target/product/aosp_base_telephony.mk

diff --git a/target/product/aosp_base_telephony.mk b/target/product/aosp_base_telephony.mk
index f326a00..0d4e333 100644
--- a/target/product/aosp_base_telephony.mk
+++ b/target/product/aosp_base_telephony.mk
@@ -14,3 +14,6 @@
 # limitations under the License.
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
+PRODUCT_PACKAGES += \
+    messaging

target/product/telephony.mk

diff --git a/target/product/telephony.mk b/target/product/telephony.mk
index 084f86c..919d024 100644
--- a/target/product/telephony.mk
+++ b/target/product/telephony.mk
@@ -21,7 +21,6 @@
     CarrierConfig \
     Dialer \
     CallLogBackup \
-    Mms \
     rild
 
 PRODUCT_COPY_FILES := \