summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMike Dodd <mdodd@google.com>2015-08-12 18:58:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-12 18:58:59 +0000
commit09baf014917b2c59e43631e7aa4d9ef0ade80ad8 (patch)
tree44bbc7a2e91cda4944c39da898bb0f5d9487a9a4 /target
parentd95990e68568fe5df9e4d8981180d22d9f363a0f (diff)
parent745d11ccd077060b5d3b0e3e53682e8c1f85dd66 (diff)
downloadbuild-09baf014917b2c59e43631e7aa4d9ef0ade80ad8.zip
build-09baf014917b2c59e43631e7aa4d9ef0ade80ad8.tar.gz
build-09baf014917b2c59e43631e7aa4d9ef0ade80ad8.tar.bz2
am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66': Revert "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 d3b254f..73c2524 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -34,7 +34,7 @@ PRODUCT_PACKAGES := \
libWnnEngDic \
libWnnJpnDic \
LiveWallpapersPicker \
- messaging \
+ Mms \
Music \
OpenWnn \
Protips \
diff --git a/target/product/telephony.mk b/target/product/telephony.mk
index 101a666..084f86c 100644
--- a/target/product/telephony.mk
+++ b/target/product/telephony.mk
@@ -21,7 +21,7 @@ PRODUCT_PACKAGES := \
CarrierConfig \
Dialer \
CallLogBackup \
- messaging \
+ Mms \
rild
PRODUCT_COPY_FILES := \