tree 34f4ea45b38dcdeb020e526030dbf06d1a490d30
parent 269b7a000204033d79b669f53c09053ba300721b
parent b68085f552cd11ebe6078640ab2ea571ae02e48f
author Thiébaud Weksteen <tweek@google.com> 1699923207 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699923207 +0000

Merge changes I0fbd41b6,If791b6d8 into main am: dcd948462b am: b68085f552

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817094

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