| commit | c695bc8528cdd4bd6c07f6fef8033ae5dcc218ac | [log] [tgz] |
|---|---|---|
| author | Anvesh Renikindi <renikindi@google.com> | Fri Sep 29 18:43:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 18:43:32 2023 +0000 |
| tree | 13b1bbab4255ab5f3bab55e6e4bdbb294e683fbd | |
| parent | 6abaaf4f548606fd45b5f0afdd79e9e0be4bcfa5 [diff] | |
| parent | e0fef8e0020875d9b228e25906fb108f28338786 [diff] |
[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: 116c333741 -s ours am: c607a8d9a2 -s ours am: f8374721f3 -s ours am: e0fef8e002 -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: Ief3f57c1d10256cfad973f19b8bf5cb3d61e1c8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>