.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs · longtb · Simicart / Android-core

Merge remote-tracking branch 'origin/trunk' into trunk · 6677020c

quan authored Jan 12, 2016

Conflicts:
	SimiCart/src/com/simicart/core/catalog/product/fragment/ProductDetailParentFragment.java
	SimiCart/src/com/simicart/core/config/Config.java

6677020c