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