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

Commit 56f7037d authored by Treehugger Robot's avatar Treehugger Robot Committed by Dave Mankoff
Browse files

[conflict] Merge "Handle static methods in Plugins better." into main am: 086613e0 am: 6a880e0f 

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



Change-Id: Ia91f42f7b00cfbac550dc610eff54ff9c62fafd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b10d202 6a880e0f
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