tree 209c57f42a6b42e3a5ff7d9c3050b84845b64fb6
parent 8a4eb8a07e99f82d3a02bc1885e59ac72292d298
parent f4242ad13c75910a761429279ddeafde6442d49c
author David Pursehouse <dpursehouse@collab.net> 1570790903 +0900
committer David Pursehouse <dpursehouse@collab.net> 1570790903 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Update _calculatePatchChange to not include MERGE_LIST

Change-Id: Id22f00c6b3a1c2b3fb1ab24a109ed6de0e6d1a96