| commit | 9d918511dcb71dc643c3f70df62a9a2b89893a63 | [log] [tgz] |
|---|---|---|
| author | Sihua Ma <sihua@google.com> | Thu Jan 18 21:08:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 18 21:08:06 2024 +0000 |
| tree | 66fe161a42376de64a36a5addeef68b5f0ca5398 | |
| parent | 1c681f53a383e951cebcd04f57ead48cdbe5cb51 [diff] | |
| parent | 4751027852a95e2d8db47b4c5d28a4c79b8f2175 [diff] |
[automerger skipped] Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev am: 679d9285b9 am: cfe8d7d28d am: fc3b7a736a am: 4751027852 -s ours am skip reason: Merged-In I0eedf4574975bfae88801e0153816135fc1c8181 with SHA-1 dc464d6e52 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2912083 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2915243 Change-Id: Ic34ffe5bb92aad892b9cac31c72574b0ea078809 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>