tree 1205e217573181f87c259c43418024688d737864
parent 9870801111596dd03b3d88419cbde21c667e7376
parent f8713e188492d30c0b7f8fd09ebab66cf7bc7646
author Ady Abraham <adyabr@google.com> 1567561244 -0700
committer android-build-merger <android-build-merger@google.com> 1567561244 -0700

[automerger skipped] SurfaceFlinger: Some fixes to DispSync
am: f8713e1884 -s ours
am skip reason: change_id I1f9544b064305c87f973120cc1bc59a0268b78e5 with SHA1 45e4e3634e is in history

Change-Id: I5e34f410ef5fa18f9d88cce4be9a79284f6a179f