| commit | 8684f37cf96b2de918b8a1529f5bbe1f4f701a1c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:24:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:24:07 2021 +0000 |
| tree | bcec3057816dadf861c7409dc27cfd0a82d20bbd | |
| parent | fc907ff56d457fb920081f18082610327e641bd1 [diff] | |
| parent | a950e8bb684828a69860cd13ef1fe081849bead2 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: c328fab955 -s ours am: a950e8bb68 -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: I0581864096d1d2cf4de1918ca64204e4d8aec0b7