| commit | f8374721f38c77eaa9030848b008893e75681e76 | [log] [tgz] |
|---|---|---|
| author | Anvesh Renikindi <renikindi@google.com> | Fri Sep 29 17:41:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 17:41:57 2023 +0000 |
| tree | cab6f2f3744d3c1240d2e39b1fcb919cf16a4193 | |
| parent | 8b2d61eb8f6a113caadb23efc167cb9316aed70d [diff] | |
| parent | c607a8d9a2007f981d0e9c72035fcdf5ab569afb [diff] |
[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c333741 -s ours am: c607a8d9a2 -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: If886be90908cf8f90ac6ae45df066e18a84e0e23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>