commit 7183487091758e81e07f5618c11fc7d7851cfcdb
author Reena Lee <reena@google.com> Wed Mar 23 19:29:13 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 23 19:29:13 2011 -0700
tree eb4e05ad087f8cccc5f14014bfe6b1f549e7bc26
parent 8835aed78de8fbe6a76df5b15a6c4ebf7852e337
parent a755aafac9631659b52d2982874594c618a30e4b

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 of GooglePart

* commit 'a755aafac9631659b52d2982874594c618a30e4b':
  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.