ivan19871002 Update jason_user_defconfig
aa6596e Sep 3, 2018
Update jason_user_defconfig
fix merge error
aa6596e