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

Skip to content
Commit 6e77c12b authored by George Chan's avatar George Chan Committed by Automerger Merge Worker
Browse files

Resolved merge conflict on OWNERS file. am: 49e4f4ca 

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



Change-Id: I1a2a5d723a142d5ba2faedd4eca413c2cfc34856
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f1fef89 49e4f4ca
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment