tree bce886322dd8b6eafe4d0c398df38b9195ec2d14
parent 2212645bd869a903210f0b52b0d8acb23a5cb860
parent 84a792e03448047242fdc606af3160a113f80525
author Steven Thomas <steventhomas@google.com> 1562963382 -0700
committer android-build-merger <android-build-merger@google.com> 1562963382 -0700

Merge "When dropping a frame, merge its damage region" into qt-r1-dev am: fcc3962a64
am: 84a792e034

Change-Id: Icb10b8e53a113796ed8eccb7d3a61a473643bc96