| commit | fa74a4dc2166f1b1d7bfbfb7f6b743f192e9bee1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jan 07 17:48:51 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 17:48:51 2022 +0000 |
| tree | f95ecc2e0f77f34f671b5d212d48a94fa66bd2f1 | |
| parent | 5edd6a2308f5fbaa68a803ee81155a296f8ed303 [diff] | |
| parent | 2d26f82ab948f897dde83f34aba0e2e9cf912d17 [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 2d26f82ab9 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1940586 Change-Id: I59a7312c2470bc5e6daa56e15e6f8f74a1bb8833