CNLive Android Team / ModulePedometer · Commits

# Conflicts:
#	config.gradle
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java

# Conflicts:
#	config.gradle

# Conflicts:
#	config.gradle

# Conflicts:
#	config.gradle
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java

# Conflicts:
#	config.gradle
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java

2 修复卡路里bug