Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -82,7 +82,6 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     private Activity activity;
 
-
     @Override
     protected int getLayoutId() {
         return R.layout.x_account_security_layout;