tree 5bc4942b01f746a803ffe4019217cf97275caa3a
parent df8a0739f7ab42ce59e2370867d26ed2793b6228
parent d9c2a80fd5b912cd63b020ae8dcd694bd9f954ea
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603207609 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1603207609 +0000

Merge "Merge "Change the position of addAndGetFrameTimestamps when queueBuffer" into android10-tests-dev am: 7eca3198fd" into android11-tests-dev