DESCRIPTION

CBQE-3505: Add changes for conflict resolition set-meta

Change-Id: Ia1db339a00d235754865583c9a137f30d888d2dd


COMMENTS

author: Amani Conrad
date: 2016-07-02 00:34:18.790000000

Uploaded patch set 1.

-------------------------------------
author: Amani Conrad
date: 2016-07-02 00:34:33.699000000

Patch Set 1: Code-Review+2 Verified+1

-------------------------------------
author: Tate Garrett
date: 2016-07-02 00:34:35.145000000

Change has been successfully cherry-picked as 54692edd0b83d2b3dd4cde9ff05f08f30a8edf98 by Amani Conrad

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