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

Commit 303f20e0 authored by Kousik Kumar's avatar Kousik Kumar Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of 233c1be0 to rvc-dev... 

resolve merge conflicts of 233c1be0 to rvc-dev am: 3c125769 am: 4d645c77 am: e8d959e5

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

Change-Id: I3b5b8b15ee0a0a30b41588729f927c9622b0cf71
parents 8137c6a2 e8d959e5
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