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

Commit 13cde21b 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 am: d7cf2cb5 

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



Change-Id: I7a9faedb68db5cb0b7e9a744511c1e0f45a9a6bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9be16c3f d7cf2cb5
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