| commit | 8e3b54f855d1be0ad1c96a7c14db15480e3cd5fb | [log] [tgz] |
|---|---|---|
| author | Anvesh Renikindi <renikindi@google.com> | Fri Sep 29 17:42:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 17:42:03 2023 +0000 |
| tree | cab6f2f3744d3c1240d2e39b1fcb919cf16a4193 | |
| parent | f8374721f38c77eaa9030848b008893e75681e76 [diff] | |
| parent | 2058e088e11f3b542dc03985a6c27fd58b82a739 [diff] |
[automerger skipped] Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future am: 54cf6ff550 -s ours am: 2058e088e1 -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: I353c13d65face71cad9d21d3c4e89bc87c04e2e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>