commit | 7101eaa232dc09b9620f25d4f990f16af588b746 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 21 19:10:26 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 19:10:26 2022 +0000 |
tree | 6e5d2aec3008bcd734f0e95e2f6b14aa898aee96 | |
parent | 632f57696fcebdf700bdfa1a6ee4a4b7540a80d3 [diff] | |
parent | a9a8f5cf517910d3c4d04606006fcf220b7ea7c8 [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134 am: 3cb8c57463 am: 9ef5036620 -s ours am: 7c451fc62a -s ours am: a9a8f5cf51 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/development/+/2071347 Change-Id: I12cd2cd33a39396ac05330aafb055c84e1700202 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>