tree eb55bf55ac2de13ab6161146c2e1683157f5e5bc
parent 2dc1138c51433a4f6512466cbe3cc595e951c480
parent b18bd7f527abd4d1737d7cc0321393af325e945e
author Evan Rosky <erosky@google.com> 1690570011 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690570011 +0000

[automerger skipped] Merge "Allow shell to control transition animations" into udc-dev am: dca0a91a93 am: b18bd7f527 -s ours

am skip reason: Merged-In Iffe5625ae57c21874805ef98b67faac9f56f87f5 with SHA-1 0be0367ece is already in history

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

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