Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e102f46f authored by Anton Hansson's avatar Anton Hansson
Browse files

resolve merge conflicts of b7f0052e to pi-dev-plus-aosp 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
parents 384ccd49 b7f0052e

android/app/tests/robotests/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 


LOCAL_JAVA_LIBRARIES := \

    junit \

    platform-robolectric-3.6.1-prebuilt \

    sdk_vcurrent

    platform-robolectric-3.6.1-prebuilt



LOCAL_INSTRUMENTATION_FOR := Bluetooth

LOCAL_MODULE := BluetoothRoboTests