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

Skip to content
Commit 5b976503 authored by Patrice Arruda's avatar Patrice Arruda Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of 87deed46 to rvc-dev... 

resolve merge conflicts of 87deed46 to rvc-dev am: 925c9f29 am: db8dd5e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12736108

Change-Id: I6dca5e284e200caaf1ec683aad5c22a5315fc20d
parents b6f4f5a2 db8dd5e1
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