tree 847c169ec1f041add5e985f6b5b53c882adfe1aa
parent 4095361978164409f5c41f57e5966c4b725b5829
author Luca Milanesio <luca.milanesio@gmail.com> 1446655334 +0000
committer David Pursehouse <david.pursehouse@sonymobile.com> 1446686136 +0900

Rename MergeException to IntegrationException

Gerrit master has a different name for the old MergeException since
change I344c70bf8.

Change-Id: I344c70bf8ffeb3a2823a65b5fcf09ea9bff82e72