| commit | 6a3b023f71f4f861e141fe7a74afcce57eafde59 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jan 07 18:16:21 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 18:16:21 2022 +0000 |
| tree | 20b269c9eef3bcaaa1371aebaa0d6ff3ff3d8823 | |
| parent | 4e75302ba191c5bc601585cb079bbd715d81b06a [diff] | |
| parent | fa74a4dc2166f1b1d7bfbfb7f6b743f192e9bee1 [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 2d26f82ab9 -s ours am: fa74a4dc21 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1940586 Change-Id: I1e1876a11ba98de095c53d988bbc3589d3ba5aa5