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

Commit e9c76893 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: a6f4bbd4 

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



Change-Id: I00e1ae911b097b894083f9ba55a9ad3c45fb797e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f11ba55d a6f4bbd4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment