tree 4b1e040b10e402a86e2f7ff9a554989f75c7cb05
parent be11c4604ce098d7aa927ff21e9456ec412cee7f
parent 3f4989a062c7ad4bfa7b76e0720995998ba46c89
author Thierry Strudel <tstrudel@google.com> 1562214993 -0700
committer android-build-merger <android-build-merger@google.com> 1562214993 -0700

Merge "Surfaceflinger: adjust content detection fps selection" into qt-r1-dev am: 9275c965d8
am: 3f4989a062

Change-Id: I6045d2b6b4671205501386054b6ea71d5e40709d