| commit | 2f761aa43b305237c43945e70eeb6a506e25f906 | [log] [tgz] |
|---|---|---|
| author | Siim Sammul <siims@google.com> | Thu Nov 23 07:25:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 23 07:25:23 2023 +0000 |
| tree | 223aa01f9a1ec5eb0c79d2aa90e80b047980c989 | |
| parent | d8b3aa8c9b3e0eb7d3aa4c6f2056dc4424ef6451 [diff] | |
| parent | 0380369158b0c5539be55cfef71a35febda32189 [diff] |
[automerger skipped] Merge changes I5dd690b9,I659f927a into main am: 693bf0c2fc am: 8bc59b41fc am: 0380369158 -s ours am skip reason: Merged-In I5dd690b939a977a9a873b2cae9d2b1c6739a1601 with SHA-1 dd64c1b207 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2843678 Change-Id: I93ddf7af1e67e42efb427b7d0041b0d136c79f00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>