commit f8601c0c2a30887a650a3e85a2aad2c77f4ab7f6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jan 31 23:04:48 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 31 23:04:48 2018 +0000
tree a71b94afb60262ce1ed323313187762cff86ffcf
parent a05e7a0f703b603fb4c7b07fc3cd414cf63e83f8
parent 1a9c0f00c462c6021f7d27e91a0eddfe0ed8d025

[automerger] Disallow attaching files from our own EmailAttachmentProvider. am: 44a5db2dc0 am: ec59cd4c39 am: 7764908d8d am: 29f9af1b0a am: 1f74cbabba am: 9a7c825a34 am: 4c824af722 am: 425e9f9156 am: c94203d0c3 am: 5d2c780a76 am: 35ead32a64 am: f842517566 am: d5431e6730
am: 1a9c0f00c4

Change-Id: If8e27197b70dfccafe2228cb1004fb19fa5ac774

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index d757c7b..8dcf334 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -33,7 +33,7 @@
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
-LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.mock.stubs legacy-android-test
 
 include $(BUILD_PACKAGE)