tree d9861715949d4e48b0be28b307cf86b66586170e
parent 2cd7ad6ce76a1e6aa1f855ed82cfee2bb7eb9b17
parent e6ffb72e557572c5b7c259ae78058a7daad51ebb
author Rob Carr <racarr@google.com> 1557945073 -0700
committer android-build-merger <android-build-merger@google.com> 1557945073 -0700

Merge "Restore new SurfaceView background implementation." into qt-dev
am: e6ffb72e55

Change-Id: I8c9b101c5f6122f5c09ba786393fbec4590fd1e3