Signed-off-by: jiangtao <390074555@qq.com>
Merge branch 'master' of https://github.com/phrong-x/git_ihome.git

Conflicts:
	loves_family/loves_family/bin/classes.dex
	loves_family/loves_family/bin/loves_family.apk