Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp * commit '087c06039faeac54aa3063b643c5a6aafe51aa30': Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp * commit '087c06039faeac54aa3063b643c5a6aafe51aa30': Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.