update AndroidManifest.xml
Signed-off-by: rockman12352 <271175490@qq.com>
Merge branch 'master' of https://github.com/rockman12352/JustMemo

Conflicts:
	justmemo/AndroidManifest.xml

Signed-off-by: rockman12352 <271175490@qq.com>