android-surface-simple-introduce
Merge branch 'master' of https://github.com/xxxzhi/xxxzhi.github.io

Conflicts:
	_posts/2014-09-16-android-surface-simple-introduce.md