Merge "Fix references to resources for Settings" into main

src/com/android/settings/wifi/WifiEntryPreference.java

@@ -122,7 +122,8 @@ public class WifiEntryPreference extends RestrictedPreference implements
         view.itemView.setContentDescription(mContentDescription);
 
         // Turn off divider
-        view.findViewById(R.id.two_target_divider).setVisibility(View.INVISIBLE);
+        view.findViewById(com.android.settingslib.widget.R.id.two_target_divider)
+                .setVisibility(View.INVISIBLE);
 
         // Enable the icon button when the help string in this WifiEntry is not null.
         final ImageButton imageButton = (ImageButton) view.findViewById(R.id.icon_button);