summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMike Dodd <mdodd@google.com>2015-08-12 17:49:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-12 17:49:48 +0000
commitd95990e68568fe5df9e4d8981180d22d9f363a0f (patch)
tree0bc13a1dc605d1c7e82936b4e2d3298e543a538e /target
parenta749ea4b47eb3b850225ddc934d4890fc5e77600 (diff)
parent02389bf940f751ffb85c8c2187a7039f0c18dad1 (diff)
downloadbuild-d95990e68568fe5df9e4d8981180d22d9f363a0f.zip
build-d95990e68568fe5df9e4d8981180d22d9f363a0f.tar.gz
build-d95990e68568fe5df9e4d8981180d22d9f363a0f.tar.bz2
am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1': Include new AOSP messaging app in base builds.
Diffstat (limited to 'target')
-rw-r--r--target/product/sdk_base.mk2
-rw-r--r--target/product/telephony.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index 73c2524..d3b254f 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -34,7 +34,7 @@ PRODUCT_PACKAGES := \
libWnnEngDic \
libWnnJpnDic \
LiveWallpapersPicker \
- Mms \
+ messaging \
Music \
OpenWnn \
Protips \
diff --git a/target/product/telephony.mk b/target/product/telephony.mk
index 084f86c..101a666 100644
--- a/target/product/telephony.mk
+++ b/target/product/telephony.mk
@@ -21,7 +21,7 @@ PRODUCT_PACKAGES := \
CarrierConfig \
Dialer \
CallLogBackup \
- Mms \
+ messaging \
rild
PRODUCT_COPY_FILES := \