commit | 81194d74d05791ade925205e9973e962a2ced864 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Oct 07 00:20:00 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:20:00 2023 +0000 |
tree | d2eba39bae54ed48911140caebf1b69257b2964e | |
parent | 622d804019fb9576828ba95aba986948fad7fe22 [diff] | |
parent | 85e306f560a6777fb017a73d5eae12708036f34e [diff] |
[automerger skipped] Merge Android 14 am: 1961b2f7b1 -s ours am: cde1f0f0f5 -s ours am: 3df1330835 -s ours am: 12286b25d7 -s ours am: 85e306f560 -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: Id46eacf4794da827863d03336a578aa6bd0aea9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>