Merge branch 'drawer' of github.com:shadowsocks/shadowsocks-android into drawer

This commit is contained in:
Mygod
2016-12-24 22:33:48 +08:00
@@ -102,7 +102,7 @@ final class ProfilesFragment extends ToolbarFragment with OnMenuItemClickListene
adView = new NativeExpressAdView(getActivity)
adView.setLayoutParams(params)
adView.setAdUnitId("ca-app-pub-9097031975646651/5224027521")
adView.setAdSize(new AdSize(320, 132))
adView.setAdSize(new AdSize(328, 132))
itemView.findViewById(R.id.content).asInstanceOf[LinearLayout].addView(adView)
// Demographics