tree 1a957390c9328b75f9bd9e2269bbd74f20b828a0
parent 7378bbeefeffd152f6fba4b25d1f254e9b82f187
parent f678bb45a480a857721378ea6165ce6a4b6d14d9
author Corey Tabaka <eieio@google.com> 1501905050 +0000
committer android-build-merger <android-build-merger@google.com> 1501905050 +0000

Merge "Merge "Fix race condition clearing VSYNC enable on VrFlinger startup." into oc-dr1-dev am: 8f09b6abec am: e0433c8d96" into oc-mr1-dev-plus-aosp
am: f678bb45a4

Change-Id: Ia1cd849727945c31e2359b0bf153f0bbd02a7067