tree 4e96d9d2806cab619764d2ff29f8431822be926e
parent eeb46723716c41ba6c6660001ffac4c53cc11cb1
author Karl Rosaen <> 1240538421 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240538421 -0700

AI 147564: Merge back from search branch to donut.  Notes:
  - all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
  - all new public apis are @hidden; they will still get reviewed by api council once we're in git
  - other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
  to the contacts provider that was reviewed by jham

Automated import of CL 147564