tree 0b3600ef5559c53ffb9ea1d04f5305fe982ce9f8
parent d5c5c04fb2f9a9535f9905141dcdbca34e2a96b6
parent 78a54762e5e9e316492571ac02418b70938585dd
author Alec Mouri <alecmouri@google.com> 1563322874 -0700
committer android-build-merger <android-build-merger@google.com> 1563322874 -0700

Merge "[SurfaceFlinger] Don't touch hw vsync in DEFAULT RR with kernel timeout" into qt-r1-dev am: ddb5f84005
am: 78a54762e5

Change-Id: I9de0eccea25bec83f4bda9ee66ec99ddf5a9db60