tree 15587cd8a1fed28f4e72e6099feb7b1daf4414dc
parent ddea3d30453a7e4ee06ae0c6e40222865e9e0ffd
author Paladox none <thomasmulhall410@yahoo.com> 1570741173 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1570781377 +0000

Update _calculatePatchChange to not include MERGE_LIST

Bug: Issue 11715
Change-Id: I255c8c517e21cb5a3e83404dcbf45ea3b94662d7