commit 7352480ad5b576f3ec4f964e7b5481b057fd2e13
author Reena Lee <reena@google.com> Fri Mar 11 23:59:26 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 11 23:59:26 2011 -0800
tree 64f899edba0df1f232e9d19f5e81040a0a36e3c7
parent 3737aa543fa22c980c72c83f09c5f4e84ed38734
parent 0c3789b217a41b8d8084ba42281e3e08208a4044

am 0c3789b2: (-s ours) 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 GooglePartnerSetu

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