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

Commit 2974e295 authored by Jared Duke's avatar Jared Duke Committed by Automerger Merge Worker
Browse files

Merge "Fix static lib collision between system_server + framework" am:...

Merge "Fix static lib collision between system_server + framework" am: a6f4bbd4 am: e9c76893 am: 84960032

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050305



Change-Id: I71a150e55528d1e5834cc9ec0ff97bf2cde9d11d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4935cbc6 84960032
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ java_library_static {
        "android.hardware.biometrics.fingerprint-V2-java",
        "android.hardware.oemlock-V1.0-java",
        "android.hardware.configstore-V1.1-java",
        "android.hardware.contexthub-V1.0-java",
        "android.hardware.ir-V1-java",
        "android.hardware.rebootescrow-V1-java",
        "android.hardware.soundtrigger-V2.3-java",