tree cba2562fd4e46c12cdd49d231a09d29359d0c808
parent 7295f32507777d594f716a67653600c4851f40ba
parent 0ebf0252e09c7b675c0f0985003ead209806e247
author Matt Pietal <mpietal@google.com> 1560298353 -0700
committer android-build-merger <android-build-merger@google.com> 1560298353 -0700

Merge "GlobalScreenshot - Fix race condition" into qt-dev
am: 0ebf0252e0

Change-Id: Idd450a77f83c91b50e706b17ef3fb123c000a779