merge from open-source master

Change-Id: Id9c258165d9bb326271218a562d782fa52608213

src/com/android/settings/ApplicationSettings.java

@@ -124,7 +124,7 @@ public class ApplicationSettings extends PreferenceActivity implements
     }
 
     public void onClick(DialogInterface dialog, int which) {
-        if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON1) {
+        if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
             setNonMarketAppsAllowed(true);
             mToggleAppInstallation.setChecked(true);
         }