| commit | 92b4b0f20fb6114f4f646923beac3ba8be04f994 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jan 07 18:16:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 18:16:19 2022 +0000 |
| tree | c2136ac904b243facdc3f3dca327c9549a53b634 | |
| parent | 33e0b830dcf0c7912c983f78ea003691031bd2dc [diff] | |
| parent | 84e861430f4a872d213cb1a72144fb5ad7988bcc [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours am: 84e861430f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940733 Change-Id: I01ca3dc594e0a18cbbd8f8196af3fb4a806df617