commit | 595ecc5ec3444a81dd601cad3247eec0d22a94d5 | [log] [tgz] |
---|---|---|
author | Anvesh Renikindi <renikindi@google.com> | Fri Sep 29 18:29:33 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 18:29:33 2023 +0000 |
tree | 9666be85d1100ae9ac4173353b0f81cce3afec3e | |
parent | e0fef8e0020875d9b228e25906fb108f28338786 [diff] | |
parent | 8e3b54f855d1be0ad1c96a7c14db15480e3cd5fb [diff] |
[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff550 -s ours am: 2058e088e1 -s ours am: 8e3b54f855 -s ours am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 905c26a854 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867188 Change-Id: I0a7f8bea05ef93af5f60471df19143755208941f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>