Signed-off-by: hacri <linleqi@gmail.com>
Merge branch 'h-edition' of https://github.com/moegirlwiki/MoegirlAndroid.git into h-edition

Conflicts:
	AndroidManifest.xml
add shackdetector and splash activity

Signed-off-by: hacri <linleqi@gmail.com>