am 311e3662: Merge "Merging emulator smoke test projects" into master-nova

* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
  Merging emulator smoke test projects
This commit is contained in:
Evan Charlton
2014-05-13 15:19:06 +00:00
committed by Android Git Automerger
10 changed files with 13 additions and 128 deletions

View File

@@ -417,7 +417,5 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-leanback_intermediate
# Tests Component
##############################################################################
framework/layoutlib-tests.jar tests/libtests/layoutlib-tests.jar
system/app/ConnectivityTest.apk tests/emulator-test-apps/ConnectivityTest.apk
system/app/GpsLocationTest.apk tests/emulator-test-apps/GpsLocationTest.apk
system/app/SmsTest.apk tests/emulator-test-apps/SmsTest.apk
system/app/EmulatorSmokeTests.apk tests/emulator-test-apps/EmulatorSmokeTests.apk