| commit | 41df588cf438b8a5e63e80b702d752f1d27c6004 | [log] [tgz] | 
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Dec 06 03:15:26 2022 +0000 | 
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 06 03:15:26 2022 +0000 | 
| tree | 514389eb8024e1318c177ef0cdcaa184f6762c51 | |
| parent | e4f1fd5622288d039b571b4c3202a7f1e530f97e [diff] | |
| parent | a57ba775f490f4a4e7bb2a9464980b01d3088130 [diff] | 
Merge cherrypicks of [18122622, 20123803] into sc-v2-platform-release. am: a57ba775f4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20226470 Change-Id: I51fef0265b83b07825c0f19f02db2e9508a2b334 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>