tree d0945eed2b37de8b94dbcb9f34a040827e203fd3
parent 16d8f10ebf75e809cc14d866fded7749363b9d8f
parent 5eb80efb695f73c53e5a2776c485d91ae8354eff
author Scott Main <smain@google.com> 1256869585 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256869585 -0700

am 5eb80efb: am 3534dadd: docs: fix XSS vulnerability in search

Merge commit '5eb80efb695f73c53e5a2776c485d91ae8354eff' into eclair-mr2

* commit '5eb80efb695f73c53e5a2776c485d91ae8354eff':
  docs: fix XSS vulnerability in search