commit | 4739ab77e1edbb9004fe7932ab968fd88d5e3f8b | [log] [tgz] |
---|---|---|
author | ThiƩbaud Weksteen <tweek@google.com> | Wed Nov 01 23:12:12 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 01 23:12:12 2023 +0000 |
tree | 9316c74a93f7e3529b216ccd09345b9a8ad5a8de | |
parent | 464952dd1722f110cfe9047c09671ddc1cf890a7 [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: Id4ceefac0437877e627eaf8b93b7e16673b26c0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>