CNLive Android Team / ModulePedometer · Commits

# Conflicts:
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java

# Conflicts:
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java

# Conflicts:
#	moudle_pedometer/src/main/AndroidManifest.xml