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

Skip to content
Commit 3d4bc62f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use 'ours' conflict resolution strategy." am: b6bb6949 

Original change: https://android-review.googlesource.com/c/platform/build/+/2285753



Change-Id: I38baef692c8f94ee650fc33263230004c6a38ae4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5985788 b6bb6949
Hide 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