commit | 64aff6766700756501b26b4b59536d01ebf5a94c | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:06:29 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:06:29 2023 +0000 |
tree | bc73f9d33519c08271c059d3119ace48d23becdd | |
parent | 44d5b2c5ab4842dd1618bb0c8b9776840f5efc36 [diff] | |
parent | 8003b3708c6aab5fd2fd7e0f5d478009089bdd3e [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 1c05b41c29 -s ours am: 755322cdff -s ours am: 3449e2d050 -s ours am: 8003b3708c -s ours am skip reason: Merged-In I2f5c523b4f547f3d769fd56dfac8738f4b28ae9d with SHA-1 53ac8c773c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/2776934 Change-Id: Idcf4bdf2d7b185013e39cdedf515f282f7f46493 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>