Merge branch 'master' of
https://github.com/androidzhaoxiaogang/fancytrendchart.git

Conflicts:
	src/xg/fancytrendchart/TrendChartView.java
Merge branch 'master' of
https://github.com/androidzhaoxiaogang/fancytrendchart.git