tree 7e1b0ef5dd5b337598fbcb29c9150b85a0c6e1e9
parent 761c37a18b524a6a3618f4fdf6e0b3b77209897c
parent 523cedfa51aacb58206ad806862bbbcad58e6b1f
author Xin Li <delphij@google.com> 1629246216 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246216 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 302c1e6fb3 -s ours am: e7947fced0 -s ours am: bff75f0143 -s ours am: 523cedfa51 -s ours

am skip reason: Merged-In I1c81d844eb6602f5c7704ff5c2ef816e2ebe89d2 with SHA-1 07fa6feb4d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/15571812

Change-Id: Ia037380f309db476def4935ba3773517e25e9ad2