Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev am: 6dfafa5d95

am: f66702c930

Change-Id: Iaa8dde8ae93cf895001505e84907dfa60b9079f1

src/com/android/settings/IccLockSettings.java

@@ -287,6 +287,11 @@ public class IccLockSettings extends SettingsPreferenceFragment
         getContext().unregisterReceiver(mSimStateReceiver);
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_icc_lock;
+    }
+
     @Override
     public void onSaveInstanceState(Bundle out) {
         // Need to store this state for slider open/close