commit | 6abaaf4f548606fd45b5f0afdd79e9e0be4bcfa5 | [log] [tgz] |
---|---|---|
author | Anvesh Renikindi <renikindi@google.com> | Fri Sep 29 18:43:16 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 18:43:16 2023 +0000 |
tree | 13b1bbab4255ab5f3bab55e6e4bdbb294e683fbd | |
parent | 9aa1819e1141cd2ba3955f034c1e0e93ef743caa [diff] | |
parent | a2b9f65a9dbbdf86bece3f18b76898a20128a5c1 [diff] |
[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c25e -s ours am: 876446b112 -s ours am: 8b2d61eb8f -s ours am: a2b9f65a9d -s ours am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d51 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24860215 Change-Id: I72c0a8f815d08b21105b3655fd78f6ea6ff55960 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>