DESCRIPTION

CBQE-3671: Update time_synchronization flag to conflict_resolution_type in testrunner
Change-Id: I2c2b7d5db83213553f5edb8faf4ce0d38b2bcf9b


COMMENTS

author: Adelaide Rodgers
date: 2016-10-19 05:52:04.328000000

Uploaded patch set 2.

-------------------------------------
author: Ezekiel Beck
date: 2016-10-19 16:17:34.927000000

Patch Set 2: Code-Review+2

-------------------------------------
author: Adelaide Rodgers
date: 2016-10-19 17:23:29.605000000

Patch Set 2: Verified+1

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

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

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