commit | 77b24aa4ee9d35120f6c96e282b866a6a42e38a1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Mar 08 11:04:14 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 11:04:14 2022 +0000 |
tree | a3b6ee5f0d822c7f517f9e3c7ce7d8e8f967f6ad | |
parent | 64ac17fc079f15bb0b4001f74528eb9620b76c7e [diff] | |
parent | a67d513bc7bd3789b78e3303ad493a0b6c87291a [diff] |
[automerger skipped] Merge Android 12L am: 61c1f4628b -s ours am: a67d513bc7 -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: I7d13d29347642de39658dbd6a011f81a6683f907