Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev

src/com/android/settings/ChooseLockGeneric.java

@@ -204,11 +204,6 @@ public class ChooseLockGeneric extends SettingsActivity {
                     mWaitingForConfirmation = true;
                 }
             }
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
             if (mForFingerprint) {
                 setHeaderView(R.layout.choose_lock_generic_fingerprint_header);
             }