tree 6eb59206c7133e65a4823e807af2a7341fa25af2
parent 1595183a0cfd18dd354231ec602ba61aa48fd7db
parent 6d94eaaffbd81e0a3b37ea33560f904000c2b669
author Vishnu Nair <vishnun@google.com> 1645045262 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645045262 +0000

[automerger skipped] Merge "SurfaceControl: Add setDropInputMode api" into rvc-dev am: 5aa3d21693 am: c3db8e7986 -s ours am: 6d94eaaffb -s ours

am skip reason: Merged-In Ifcb4133306a43874e74e8fb0f42b60842daf6f25 with SHA-1 a84612483f is already in history

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

Change-Id: I16af37016fe3605970ad356c547807a60f63a085