diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-05-11 07:56:50 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-05-11 07:56:50 -0700 |
| commit | 7a8295e0d6908fb666b91ce3e1f83653ac7ee2f6 (patch) | |
| tree | 001a6636ce1d55bd2e31ea69aa4ed2202591795d | |
| parent | 6b140bed44cd97177f46e8ccc8fb52c96fe24cb4 (diff) | |
| parent | 311ec8962bef83bc240809e8365722a3a57dfec0 (diff) | |
| download | Launcher3-7a8295e0d6908fb666b91ce3e1f83653ac7ee2f6.tar.gz | |
resolve merge conflicts of 311ec8962 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia332f1e3d9c894f5fd36674ff3c75e4896b2c13a
| -rw-r--r-- | tests/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index aaf0572ea1..6e6453ca15 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -21,7 +21,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ ub-uiautomator \ legacy-android-test \ - mockito-target-minus-junit4 + mockito-target-minus-junit4 LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml |