201908301509
The "accept/reject" all non-conflicting action shouldn't touch conflilts

Change-Id: I7977fcf32e86c86f75369563d438bf3f7abdc628
3 files changed