tree 25f08f7cac595826fe0451bbe433721934422616
parent 56dc3319406d30548901a998ed0563850e3261df
parent 14645539335c4dc172dd2c9a0abad9e5eb1da5ce
author Ady Abraham <adyabr@google.com> 1556671939 -0700
committer android-build-merger <android-build-merger@google.com> 1556671939 -0700

Merge "SurfaceFlinger: support negative phase offset" into qt-dev am: 501604c5fa
am: 1464553933

Change-Id: I8c13522211bdc4e5cf50e58ea22050278973712f