commit 85c33f500aa2ef7c70c1644617e7439b97f22a79
author Amith Yamasani <yamasani@google.com> Tue May 17 00:27:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 17 00:27:55 2016 +0000
tree 0ec8dcc89498bdbfd4f1e137ff0664ce1df93c77
parent f06c24f0c1b06aaf24637c1392cd61f9bb52f66f
parent 6f7873ca6f2ea67963a29a61705fcb00e89f9731

Merge "Add CtsShimPrebuilt" into nyc-dev

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 627d496..040377c 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -24,6 +24,7 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
+    CtsShimPrebuilt \
     CtsShimPrivPrebuilt \
     DownloadProvider \
     ExtShared \

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 58b75ea..11a66eb 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -37,6 +37,7 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
+    CtsShimPrebuilt \
     CtsShimPrivPrebuilt \
     DefaultContainerService \
     ExtShared \