Merge "Add shim app for CTS testing" into nyc-dev am: 6d0c367a64

am: 0bd176651e

* commit '0bd176651e89200089fed06a9b4481285c8edf5a':
  Add shim app for CTS testing

Change-Id: I5c16088ab06e6fad7f42209d2beacadce15f0af0
This commit is contained in:
Todd Kennedy 2016-05-02 23:04:43 +00:00 committed by android-build-merger
commit 55ec854841
2 changed files with 5 additions and 3 deletions

View file

@ -24,16 +24,17 @@ PRODUCT_NAME := core
PRODUCT_PACKAGES += \
BackupRestoreConfirmation \
WallpaperBackup \
CtsShimPrivPrebuilt \
DownloadProvider \
ExtShared \
ExtServices \
DownloadProvider \
HTMLViewer \
MediaProvider \
PackageInstaller \
SettingsProvider \
Shell \
StatementService \
WallpaperBackup \
bcc \
bu \
com.android.future.usb.accessory \

View file

@ -37,12 +37,13 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
BackupRestoreConfirmation \
WallpaperBackup \
CtsShimPrivPrebuilt \
DefaultContainerService \
ExtShared \
ExtServices \
SettingsProvider \
Shell \
WallpaperBackup \
bcc \
bu \
com.android.location.provider \