nothing
:wq
:q
:Merge branch 'master' of github.com:ddssssdd/EasyDrive366_android

Conflicts:
	gen/com/handmark/pulltorefresh/library/R.java
changed pull interface
Merge branch 'master' of github.com:ddssssdd/EasyDrive366_android