| commit | c9aca92b7c0212f11fbb0850c67f77c67dd0cc2c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:44 2021 +0000 |
| tree | d51222daf1c50866589723035df31049eab4dfbb | |
| parent | b4bc092f8772538de5a134a2e025a66b851f6520 [diff] | |
| parent | 295aaed5c3f1ddc2578c4dff3969cd9d5b03c8ee [diff] |
[automerger skipped] Merge "Merge Android 12" am: 9243f909f6 -s ours am: f532052993 -s ours am: 7982b965d0 -s ours am: 9d2a02f154 -s ours am: 295aaed5c3 -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: Ic3cd5f36302762c354b2b2b2727c458f6fcf1fce