ロック解除機能追加
no message
Merge branch 'master' of https://github.com/MetroCover/MetroCover

Conflicts:
	res/values/dimens.xml