add AnddroidManifest
Merge branch 'master' of github.com:HalfLike/MSDKDemo
update
conflict
solves conflit