[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 1d9d14d79a -s ours am: 5018ef0b54 -s ours am: 04efa92761 -s ours am: 670c677602 -s ours am: 7510324dd4 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2059207

Change-Id: I572a065f702380fda1acd64a6940c6a071aee79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Yi 2022-04-08 20:34:06 +00:00 committed by Automerger Merge Worker
commit 79fa7f99b9

Diff content is not available