tree 5dd04f5767783e08559c4e6ce7a03b2d5f94418b
parent 88b0984638857ac7139de83b18dc7cad23670b4d
parent 5740b142a7b5f66768a2d904b267dccaef1a095f
author David Pursehouse <david.pursehouse@sonymobile.com> 1452233770 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1452233883 +0900

Merge branch 'stable-2.12'

* stable-2.12:
  MergeValidationListener: Adjust to the changed onPreMerge() signature

Change-Id: I2297bc0f4582dbe054f28701adc1150136887d08