| commit | 2058e088e11f3b542dc03985a6c27fd58b82a739 | [log] [tgz] |
|---|---|---|
| author | Anvesh Renikindi <renikindi@google.com> | Fri Sep 29 16:41:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 16:41:46 2023 +0000 |
| tree | 1211e082cc6e0868b8a3a64c7f7c631383a99cd0 | |
| parent | c607a8d9a2007f981d0e9c72035fcdf5ab569afb [diff] | |
| parent | 54cf6ff55077b25242cea89c043d00a69f59ec07 [diff] |
[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff550 -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: I9fc86b0c7010f54ee51a98aa17bccf55027e7812 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>