diff options
| author | 2022-06-20 23:41:22 +0000 | |
|---|---|---|
| committer | 2022-06-20 23:41:22 +0000 | |
| commit | 403f9177610717833f69923ce47d7900744dfa62 (patch) | |
| tree | f0c71ea96dc35cf5bdac56f392d76962d3288c1e /java/java_test.go | |
| parent | 65d194882b1ce439f76e2a6c9a55e64f3903539b (diff) | |
| parent | 3a2c1a68c2cea62a10544bf1ca640946f444afdd (diff) | |
[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: 21fad0c7cb -s ours am: 3a2c1a68c2 -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: I931f6032ea8697110ebac7cb92084a259a05d2bd
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