diff options
| author | Kousik Kumar <kousikk@google.com> | 2022-06-20 23:05:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-20 23:05:11 +0000 |
| commit | 21fad0c7cb2d24df5bb63ed8949bc3dfbe8bc163 (patch) | |
| tree | f0c71ea96dc35cf5bdac56f392d76962d3288c1e | |
| parent | 2ccd41408e2cdee4171fe338fbe703b6228ff6b1 (diff) | |
| parent | 5260803c6714b2dae52f5d08ae5ac280369c77c1 (diff) | |
| download | soong-21fad0c7cb2d24df5bb63ed8949bc3dfbe8bc163.tar.gz | |
[automerger skipped] [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 am: 9dedb60c6a am: 5260803c67 -s ours
am skip reason: Merged-In I29aec9576e86b9ed3051df7943404abd478c549b with SHA-1 9eb43e26c4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18931226
Change-Id: Iedc9062a3df08af019895af0b527379db437e485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions