| commit | f53205299372ad70b567cbd61b7e87653e7ccc05 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:19:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:19:54 2021 +0000 |
| tree | c2f19f92e4503b2de0afeebdd9bf7aeb1bb2e9c1 | |
| parent | adcb6a2733c1baf66e5ad72365965ab504f5f959 [diff] | |
| parent | 9243f909f67b7c46c23b94f2b05ce4476ba295d5 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 9243f909f6 -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: Icb913f6ce67a2f1cf42aaa4ea2f1a2c86d4ac327