tree 997afd9ad1be8ee7b2759b5c43d9f74c87cd6499
parent 9279fa954ac08e851618b660ab426bbf7a3c6477
parent 394b76dd52295b0e83a8599f3a2f4ca438acda6f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580544816 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580544816 +0000

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

Change-Id: I47acc36fbc439b4022e9f367ac0c38fc97e3979f