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

Skip to content
Commit cb9ea5b0 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Disallow use of error-prone merge-strategies" am: 68892c49 am: b862d094 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I981556de4a6f12752ea765fdeaf601a0d0db1d7b
parents 48dee57d b862d094
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