| commit | 647f189baee33e3dceb4487393e49d8619656c38 | [log] [tgz] |
|---|---|---|
| author | Jim Shargo <jshargo@google.com> | Wed Oct 11 02:03:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 11 02:03:25 2023 +0000 |
| tree | 5794a51a45ea8f5427c4e23481ee9bf25001c559 | |
| parent | 60f8a465aeafd36128769abaee420145451f95e6 [diff] | |
| parent | dd8078bff67d8e4d6191ceb94c376d38b536b276 [diff] |
[automerger skipped] Merge changes from topic "nativewindow-rust" into main am: 5d6006d85b am: 6c3e2f72a7 am: a0b0fd7b5b am: 31627ebf8f am: dd8078bff6 -s ours am skip reason: Merged-In Iaf916fabe49190f47abd1a9ed34afdb76fd20e40 with SHA-1 4ab0fdc9e6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2776854 Change-Id: I52893aca3982ff575beb2a448e11309ac31e9729 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>