tree 08cda715cdc47d8bc227b00027827abc69a2d4ec
parent 18908d27e6828aaafb24f957332e1f95b8395672
parent e275327f52ad5d74d08a6e476d626766eb5d7786
author TreeHugger Robot <treehugger-gerrit@google.com> 1650454295 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650454295 +0000

[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: a095092266 -s ours am: bf97a14088 -s ours am: 8ea12a4ace -s ours am: e275327f52 -s ours

am skip reason: Merged-In I43d74a085134095c4006856e9fa32fa2d77b6715 with SHA-1 1d3ff6c479 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/aidl/+/17805543

Change-Id: Ib4d703db44e7648c1b9378f0907780878e3402e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>