| commit | 295aaed5c3f1ddc2578c4dff3969cd9d5b03c8ee | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:33 2021 +0000 |
| tree | ad49fbd7475ef2754c518ee3ecdb601117e08262 | |
| parent | d7323815c8df69b0d545e938b2aa99c9836aa0c9 [diff] | |
| parent | 9d2a02f15405ee620372cc1523f12286de927e05 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 9243f909f6 -s ours am: f532052993 -s ours am: 7982b965d0 -s ours am: 9d2a02f154 -s ours am skip reason: Merged-In Ifb27b3eb12454fa96f07e6797745c697b4f831c4 with SHA-1 adcb6a2733 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1847658 Change-Id: I5dadcb4e32f4e44c922da7485f570491e64d6110