| commit | f3434137192bfa0915554b4e4e9eada59f82a1a7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 11:05:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:05:29 2023 +0000 |
| tree | d5b7f81c14bdeed7e3addc9adca7aef81184a466 | |
| parent | 85e306f560a6777fb017a73d5eae12708036f34e [diff] | |
| parent | 9e38dade3b52b44442a17096784b983eb36041c2 [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 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: I029e6d5f0da00ab09bdf483bd22e86fb621acebf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>