Commit f7f970fa938b646d3d16b4383c7867669aca17bf

Authored by 杨帅
1 parent c386c2da

Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer

# Conflicts:
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  1 +package com.cnlive.moudle.pedometer.frame.view;
  2 +
1 3 import android.content.Context;
2 4 import android.content.Intent;
3 5 import android.graphics.Bitmap;
... ...