commit 9b4b1501f3c84f5de753cdaf90fd499db81f19af
author Reena Lee <reena@google.com> Wed Mar 23 19:30:45 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 23 19:30:45 2011 -0700
tree d8bf6f817ddc510d5f2d9aab729d291c759258ae
parent 2e108efdcef6b91697c69bfa8d348669c61c040f
parent 7183487091758e81e07f5618c11fc7d7851cfcdb

am 71834870: am a755aafa: Merge "Adding search_client_id which includes the "ms-" or "tablet-" client-id prefix, set in GooglePartnerSetup. Retaining client-id (which does not include the client-id prefix) for legacy purposes, if Browser is used with an older version 

* commit '7183487091758e81e07f5618c11fc7d7851cfcdb':
  Adding search_client_id which includes the "ms-" or "tablet-" client-id prefix, set in GooglePartnerSetup. Retaining client-id (which does not include the client-id prefix) for legacy purposes, if Browser is used with an older version of GooglePartnerSetup.