-
# Conflicts: # moudle_pedometer/src/main/res/drawable-hdpi/more.png # moudle_pedometer/src/main/res/drawable-xhdpi/more.png # moudle_pedometer/src/main/res/drawable-xxhdpi/more.png
-
# Conflicts: # moudle_pedometer/src/main/res/values/strings.xml