tree 425f5c3e143fea8aca48ef51b89089eba7040cb5
parent fca025ecd8ff180964fdb5999ce9404341f29f99
parent b26ee59c2be0d0a92f2abd792da4d71ce43247c7
author Evan Millar <emillar@google.com> 1257546084 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257546084 -0800

am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair

Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp

* commit '087c06039faeac54aa3063b643c5a6aafe51aa30':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.