tree 8aec2ad6d13ee18ae9c72aa9b2ad07d7b729dffe
parent de3ab6daab66bf2b70047b1ad4fcb128e9be0abf
parent 0b7f506aa9fc94dc005f86eccedd0f4fa8ed6b6a
author TreeHugger Robot <treehugger-gerrit@google.com> 1627656880 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627656880 +0000

Merge "[DO NOT MERGE] Full - Compatibilize winscope with master" into sc-v2-dev am: 0b7f506aa9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403074

Change-Id: Iad0c1af2c398b7d50845f55b811ea0533afc3eba