| commit | 29ac9e3beb2ebf5f90ad555d1563fdd828b4ae78 | [log] [tgz] |
|---|---|---|
| author | Thiébaud Weksteen <tweek@google.com> | Wed Nov 01 23:40:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 01 23:40:12 2023 +0000 |
| tree | 982c92ebe339f3ea1439531c7dcb9507777cafa5 | |
| parent | 31485a9c1120c84b1e2a179a3d5a85fb1ba00086 [diff] | |
| parent | 4e6ab071cf221c2857d75c0f5f991432b7b51907 [diff] |
Merge changes from topics "cherrypicker-L13300000963667898:N27000001416235071", "cherrypicker-L85800000963667755:N59500001416232655" into main am: e9c999d70e am: 4e6ab071cf Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2800913 Change-Id: I50627576e8af60fca36013051a6cd42d4a168aa8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>