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

Commit 5648b12d authored by Dan Albert's avatar Dan Albert
Browse files

resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp 

Change-Id: Ifedb15de5a4db6cb0238fec93aaa2d95f1844694
parents e9b6cb80 8791ebf0

libs/androidfw/tests/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -63,6 +63,5 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libutils \

    libui \

    libstlport



include $(BUILD_NATIVE_TEST)