tree 101732f5b19826ad37bf5ff5db1dd1c5f7333a89
parent adbd9b7186fb0bc7626f34a072a927d5b8e1e593
parent 44c7334a42cd6357e2fb2226bdd0bc25f33b764c
author Alec Mouri <alecmouri@google.com> 1560901128 -0700
committer android-build-merger <android-build-merger@google.com> 1560901128 -0700

Merge "[SurfaceFlinger] Add deferred txn trace points." into qt-dev am: 5e492bfccc am: 2b734fb3b9
am: 44c7334a42

Change-Id: Ifd9380ca74dd6528c86f8e2a7b052809a74504a0