tree d04a783c4d9cf9858d217c682f6d41ad41fda905
parent 298eb79cf0d6a32d8321fdf1eb88f4db157ae195
parent fd2e17865a19f95affac27b8a6a055a627946398
author Treehugger Robot <treehugger-gerrit@google.com> 1607995295 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607995295 +0000

Merge "Separate timestamps in AdaptiveDecodeTest" am: fd2e17865a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1522721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aeee9f57d977fccf9a563000e85598f7641e680