the coflict
Merge branch 'master' of github.com:Joebrave/InjoeeAndroid
Merge branch 'master' of github.com:Joebrave/InjoeeAndroid
for the sake of upgrading
Merge branch 'master' of github.com:Joebrave/InjoeeAndroid
contentprovider add for buffer by qian