tree 0ac5f8b919be8431992c69321948d13fdee3ccc6
parent 121b65e8ddd48a6d8b103c328c6aec9102be3d23
parent 7ea0a4df6cb4f6c1afb9922c1c6f8a965774b2c2
author Bill Yi <byi@google.com> 1649447835 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649447835 +0000

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 3c41e9fae0 -s ours am: 1dcb0b6901 -s ours am: 2df4912b33 -s ours am: 7ea0a4df6c -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2058909

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