Merge change 7940 into donut

* changes:
  whoops, still need to dismiss when launching an intent for in-app search

core/java/android/app/SearchDialog.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1246,6 +1246,10 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		}
		Log.d(LOG_TAG, "launching " + intent);
		getContext().startActivity(intent);

		if (!mGlobalSearchMode) {
		dismiss();
		}
		}

		/**