am 1ac497b2: am d6e36463: Merge change Ib5077943 into eclair-mr2

Merge commit '1ac497b219aef7de2de4449a93666ab4ba5cb181'

* commit '1ac497b219aef7de2de4449a93666ab4ba5cb181':
  Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO

src/com/android/settings/AppWidgetPickActivity.java

@@ -167,6 +167,7 @@ public class AppWidgetPickActivity extends ActivityPicker {
      */
     void putAppWidgetItems(List<AppWidgetProviderInfo> appWidgets,
             List<Bundle> customExtras, List<PickAdapter.Item> items) {
+        if (appWidgets == null) return;
         final int size = appWidgets.size();
         for (int i = 0; i < size; i++) {
             AppWidgetProviderInfo info = appWidgets.get(i);