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