Activity Commit
Merge branch 'master' of https://github.com/dingdj/SlidingView

Conflicts:
	src/main/java/com/example/slidingview/MainActivity.java