Merge remote-tracking branch 'my_android/master'
# Conflicts:
# app/src/main/java/com/android/activity/adapter/StaggerAdapter.java
# app/src/main/java/com/android/activity/fragment/GoodsTypeFragment.java
# app/src/main/java/com/android/model/goods/GoodsHttp_interface.java
# app/src/main/java/com/android/model/goods/GoodsModelimpl.java
# app/src/main/res/layout/item_stagger.xml
# app/src/main/res/values/strings.xml
|