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

Commit 091ff6c0 authored by Robert Sloan's avatar Robert Sloan
Browse files

resolve merge conflicts of 2e21f8d8 to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508
parents 41bf50cc 2e21f8d8

core/jni/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ cc_library_shared { 
        "libgif",

        "libseccomp_policy",

        "libselinux",

        "libcrypto",

        "libgrallocusage",

    ],