tree 8921d76645c348e049114a40f3b8d55a12c9a72d
parent 2fd846c39f134c83c7009001e789ca4359347029
parent 25627537838c32a9af3415fd4254b5811d14b9d5
author John Reck <jreck@google.com> 1560998000 -0700
committer android-build-merger <android-build-merger@google.com> 1560998000 -0700

Merge "Revert SurfaceView back to Q's version" into qt-r1-dev am: 2f8cae24b9
am: 2562753783

Change-Id: I3c95c3c080b76b9f9f33ddb9e27d84a167cdfcb6