| commit | fb42820f33704d87424d045f310578c8106da90f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 07 00:25:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:25:03 2023 +0000 |
| tree | d2eba39bae54ed48911140caebf1b69257b2964e | |
| parent | 81194d74d05791ade925205e9973e962a2ced864 [diff] | |
| parent | f3434137192bfa0915554b4e4e9eada59f82a1a7 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 8b919d0eb0 -s ours am: 3b45a0f30c -s ours am: 8e2330d9b8 -s ours am: 9e38dade3b -s ours am: f343413719 -s ours am skip reason: Merged-In I114a4cf83978f152959a6ec244d322603ff5257b with SHA-1 85288fdb8b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2776932 Change-Id: Ie02c0d6a9169aa11b05a8e35ebec8c1ef67ae128 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>