| commit | 08ab31b4da00d3d5be96b720868ad1ca8a30ffc9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 09 10:06:08 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:06:08 2022 +0000 |
| tree | d53d5eca4b9962902ad8002b2bf28df1dd2a8127 | |
| parent | e51b113f1929970099fb768027be72b154215665 [diff] | |
| parent | 481d9e266fe99553ae17573a5064a7ac97522329 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: c006192317 -s ours am: b83a916251 -s ours am: 481d9e266f -s ours am skip reason: Merged-In I10f5fcb9874bed209a70e61db875afcf6d7c9795 with SHA-1 9540911495 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2012742 Change-Id: Ied6236b3a30a0248e53f32f4b2e0aa69059d295c