| commit | 1f239036fdcbf9f1550435b546dc84bd66381dc0 | [log] [tgz] |
|---|---|---|
| author | Siim Sammul <siims@google.com> | Thu Nov 23 07:21:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 23 07:21:56 2023 +0000 |
| tree | b0bc5ba9059d8038be471b4d777c3735f37a788e | |
| parent | 51d308f5f08ca6c0c245ffe0ddbb71c66a77fbdf [diff] | |
| parent | 22f0f5aeaf9b8cb8c82e17c54c6c3ee13001ebb9 [diff] |
[automerger skipped] Merge changes I5dd690b9,I659f927a into main am: 693bf0c2fc am: 22f0f5aeaf -s ours am skip reason: Merged-In I5dd690b939a977a9a873b2cae9d2b1c6739a1601 with SHA-1 06dc237498 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2843678 Change-Id: Ibb74370897c685dab014141259cde6e646b51b1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>