競合を解決
Merge branch 't-1310-diary-android2' of github.com:amashigeseiji/opDiaryPlugin into t-1310-diary-android2