tree 2a4830029fb714a99c5d409e39621c670627bdf3
parent 45310e4df7d74f2af648ad26bba232f537fb24b6
parent bc1ad7d7865ad87d6cac46992c21a1efa3195fff
author Ray Essick <essick@google.com> 1648674481 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648674481 +0000

Merge "Change VideoDecoderPerfTest semantics for mainline" am: 1dd6b532a5 am: bc1ad7d786

Original change: https://android-review.googlesource.com/c/platform/cts/+/2045377

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