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