commit | 27b079f6eacc99c2ae9c539b8699c650d6eb9895 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jan 07 18:57:06 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 18:57:06 2022 +0000 |
tree | 02f05b2ec5f40b6938a3c2bb47fb056bf520997f | |
parent | 1df8d38a3029b4f4da1a20a099936b37b510c4d1 [diff] | |
parent | d7d4fe0c87b44b4df152a95ce33cd25dcf54093b [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 2d26f82ab9 -s ours am: fa74a4dc21 -s ours am: 6a3b023f71 -s ours am: d7d4fe0c87 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1940586 Change-Id: I51c8fa8496c973622b6388060fffedcdc6ad1407