commit | 7308f9e23243dafff94bfb0779d0e81658a29bbb | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 18 22:57:06 2025 -0800 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 18 22:57:06 2025 -0800 |
tree | aaa14a3020dc47a4e603ad9c407e9f7f26ac6796 | |
parent | 52bf8fe75f9b19fdc8a897cf3e9c10b942c34336 [diff] | |
parent | 5283f369dbd14b140698c126530fa97b9708057b [diff] |
Merge changes from topic "am-696dc6204a4c4fab86e2574447bf235e" into main * changes: Merge changes from topic "am-7bdb02341529460ba6e7b9b0c201591d" into android15-tests-dev am: 4e6d8305ce -s ours [automerger skipped] Merge "RESTRICT AUTOMERGE: Fix ActivityEmbeddingPlaceHolderTests when task is in multi window mode" into android14-tests-dev am: 938e515156 -s ours am: d5ef30f531 -s ours