| commit | 98fe9a64fc4ea05bc117d61d5dd2685697d7b33f | [log] [tgz] |
|---|---|---|
| author | Anvesh Renikindi <renikindi@google.com> | Fri Sep 29 18:43:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 18:43:43 2023 +0000 |
| tree | 13b1bbab4255ab5f3bab55e6e4bdbb294e683fbd | |
| parent | c695bc8528cdd4bd6c07f6fef8033ae5dcc218ac [diff] | |
| parent | 595ecc5ec3444a81dd601cad3247eec0d22a94d5 [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: 595ecc5ec3 -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: Ic5ebf4b0f5b0c9ee1f50181783f92b980e4eb558 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>