diff options
| author | 2022-06-21 00:17:53 +0000 | |
|---|---|---|
| committer | 2022-06-21 00:17:53 +0000 | |
| commit | bd2243c79e4670c494ab9374d72afc257a1bc2aa (patch) | |
| tree | f0c71ea96dc35cf5bdac56f392d76962d3288c1e /java/java_test.go | |
| parent | cbd733a74f6bfb779b66ddfd6bee6d5507f1ce8b (diff) | |
| parent | d7571941a81dcb7daa975f45e7b5dfab75a12052 (diff) | |
[automerger skipped] [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 am: 9de3516b0a -s ours am: 896ee94126 -s ours am: d7571941a8 -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: I7cb8d7bdf8df2edfc5555016269129bac91be96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/java_test.go')
0 files changed, 0 insertions, 0 deletions