tree e9e4511313a8b69b6cff8de5f126b2e2b67f4fc9
parent 70e6604031695517642fa862b6a1bb39f7256aac
parent 26d438e13dae4dcdd849bd1f40fbe012e546daa4
author Robin Lee <rgl@google.com> 1703196032 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1703196032 +0000

[automerger skipped] Merge "Add a failsafe check to prevent display surfaces from remaining hidden" into udc-dev am: 0479229a3e am: 26d438e13d -s ours

am skip reason: Merged-In I6f89d8b9a9e1aa1b8673fcaffe4c1b92c4c3d210 with SHA-1 4a0e6e81f7 is already in history

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

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