| commit | 9d2a02f15405ee620372cc1523f12286de927e05 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:35 2021 +0000 |
| tree | e7806eefad6d39350766ccfe79878127cf8a7ca4 | |
| parent | f627c46e779c1d11191f86c54f90a4a849096cb6 [diff] | |
| parent | 7982b965d00991f42548cafcda28b71ab6e89753 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 9243f909f6 -s ours am: f532052993 -s ours am: 7982b965d0 -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: Iad742ad797f64963e53f0bb8f98d10c86bd1d884