tree a7c8c125951c9696f0ceb099f2ed2b5e5295a58c
parent de64e83b1d763b31614ff4eb88e6678780cf4c36
parent 7adadbf8c989d6ebaffd10477cea0f3629a88016
author Treehugger Robot <treehugger-gerrit@google.com> 1650565569 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650565569 +0000

[automerger skipped] Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 am: 89181a94c6 am: 7adadbf8c9 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103

Change-Id: Ifff2e1ae3cd3f48341bf6ca1c38fe18b2510ddbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>