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

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

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

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



Change-Id: I667f436f0315036dd743f6ba9fc7e84dff6fde25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1b2042b 3d4bc62f
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