| commit | 0462fed6d36f4d7dc8c8f567406396029baa3ae7 | [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 | 170e183eb379151fc749a3c8f023b1d2ca6da60d | |
| parent | 60267c1d09eb5bdf3d40b63c1b8eded509eb7dd1 [diff] | |
| parent | 2967e3f73001e5839136e8918ec8ed31262b5954 [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: ffb5fadd34 -s ours am: 2967e3f730 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940733 Change-Id: I01ca3dc594e0a18cbbd8f8196af3fb4a806df617