change 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/xyf/gif/MainActivity.java