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

Commit a6fa12ed authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[conflict] Merge "Remove redundant implements Dumpable" into main am: 60e101e2 am: 227dff61 

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



Flag: EXEMPT merge conflict resolution

Change-Id: I8802befdbe4d804ecf139b12f62e172f132d180a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49391343 227dff61
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