tree 9972f56c6f919ba5fe148186dda104b0164ba522
parent 3c62aa0d0bb0abc10d75f2eb0909ed072f774bb0
parent c1c2a5404a6a3a1eb86920a555ab6cd3dbb6ca56
author David Pursehouse <dpursehouse@collab.net> 1521344093 +0900
committer David Pursehouse <dpursehouse@collab.net> 1521344093 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Fix logic in NoteDbMigrator#canSkipPrimaryStorageMigration

Change-Id: Ib6642b8b38556ab2f5d906bac25d2160dedd2522