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

Skip to content
Commit 21fad0c7 authored by Kousik Kumar's avatar Kousik Kumar Committed by Automerger Merge Worker
Browse files

[automerger skipped] [conflict] Allowlist stubby to be run within the path...

[automerger skipped] [conflict] Allowlist stubby to be run within the path imposer am: 00327e6d am: 0e4e4351 am: 470adfb4 am: 56d1c8ce am: 92446e3f am: 9dedb60c am: 5260803c -s ours

am skip reason: Merged-In I29aec9576e86b9ed3051df7943404abd478c549b with SHA-1 9eb43e26 is already in history

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



Change-Id: Iedc9062a3df08af019895af0b527379db437e485
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ccd4140 5260803c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment