tree a18e930c2bcc204025dba2c995ef40b371518dad
parent db12af33e70e4a96625c2160b7bd238c8ef2d5e4
parent 9a4011934f9e60bd7ca4dde74d996c80dcc0df10
author David Pursehouse <dpursehouse@collab.net> 1570790938 +0900
committer David Pursehouse <dpursehouse@collab.net> 1570790938 +0900

Merge branch 'stable-3.0'

* stable-3.0:
  Update _calculatePatchChange to not include MERGE_LIST

Change-Id: I4c1ecb0d6c145683b620651fcf1bcd0a5f66ad76