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

Commit 2fef8780 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Unload the duplicate unused managers when they conflict" into udc-dev... 

Merge "Unload the duplicate unused managers when they conflict" into udc-dev am: 322a9ee2 am: 79008ab0

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



Change-Id: Ic71312f7a31d81aca78c5565d831afc22446ee49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e06eea2 79008ab0
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