tree 997afd9ad1be8ee7b2759b5c43d9f74c87cd6499
parent 16dd56fa2dcbadb7144592a65804dbfbbc46b1c8
parent 1976ed32dfe33e3ad871a5e5037b4beb14584e30
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580545453 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580545453 +0000

Merge "Reset direct output thread timestamp on flush" am: 394b76dd52 am: 1976ed32df

Change-Id: Ib2b7b405bcab0d63cca5c130730923640aa6e8d2