am 5fd0ea8f: am 26fe45dc: Merge change I4961c959 into eclair

Merge commit '5fd0ea8fb4827cdf183fe3c5c7f11bfd9c94d895' into eclair-mr2-plus-aosp

* commit '5fd0ea8fb4827cdf183fe3c5c7f11bfd9c94d895':
  fix [2152536] ANR in browser