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

Commit 90700b82 authored by Robert Sloan's avatar Robert Sloan Committed by android-build-merger
Browse files

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

am: 87041ff9

Change-Id: I02b2afb08ba8dc8f5601805cfd94c7cbb4ba020a
parents f141183a 87041ff9
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ cc_library_shared {
        "libgif",
        "libseccomp_policy",
        "libselinux",
        "libcrypto",
        "libgrallocusage",
    ],