| commit | 1c96fb2362a9c2e82f2994d9e99863b535421ee3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 22:18:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 22:18:50 2021 +0000 |
| tree | 5ccf00c81601a4ce77aac2c58e4f77bc7d42e287 | |
| parent | beb8b0d2562a12dff28f164a30a2105489d80c01 [diff] | |
| parent | b9d35fcde46ce71014b657dce6c0c7b6385d3950 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: c328fab955 -s ours am: a950e8bb68 -s ours am: 8684f37cf9 -s ours am: b9d35fcde4 -s ours am skip reason: Merged-In I67a05a55a122341a7c33d3eefdcc436d94e29a15 with SHA-1 af5fc3ca6f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1921401 Change-Id: I37aa5589800e9e549749144af4addd063598476d