commit 878775fd750d7164bd0920b4b94b59e0edab8ed3
author Todd Kennedy <toddke@google.com> Mon May 02 23:56:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 23:56:37 2016 +0000
tree 03bcf6aef331ab524a794b29a77545e986300e15
parent 6d0c367a64b91cdf8dc6bc25605bff7b13f35a35
parent 31003c48c12201a914c68c0a15053a6a8bf5b1c3

Merge "Revert "Add shim app for CTS testing"" into nyc-dev

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 627d496..0b5ace1 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -24,17 +24,16 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    CtsShimPrivPrebuilt \
-    DownloadProvider \
+    WallpaperBackup \
     ExtShared \
     ExtServices \
+    DownloadProvider \
     HTMLViewer \
     MediaProvider \
     PackageInstaller \
     SettingsProvider \
     Shell \
     StatementService \
-    WallpaperBackup \
     bcc \
     bu \
     com.android.future.usb.accessory \

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 58b75ea..f9ec032 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -37,13 +37,12 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    CtsShimPrivPrebuilt \
+    WallpaperBackup \
     DefaultContainerService \
     ExtShared \
     ExtServices \
     SettingsProvider \
     Shell \
-    WallpaperBackup \
     bcc \
     bu \
     com.android.location.provider \