DESCRIPTION

CBQE-3671: Update time_synchronization flag to conflict_resolution_type in testrunner

Change-Id: I4484577e0c1ce09f1ab42453de261ca4bed98afa


COMMENTS

author: Adelaide Rodgers
date: 2016-10-19 04:26:56.183000000

Uploaded patch set 1.

-------------------------------------
author: Tate Garrett
date: 2016-10-19 17:23:33.141000000

Change has been successfully cherry-picked as 39307738fe9d54032eb3241f98385f74433f0b22 by Adelaide Rodgers

-------------------------------------
