am c69e499f: am 35bcdeff: am d6fe0e1e: resolved conflicts for merge of a3712c06 to honeycomb-mr1

* commit 'c69e499f16baad795d697d2153555b2999873fb6':
  Adjust Tests to Work without Hinting
  CTS : modify "loadURL" method that wait until getProgress returns 100.
  The accuracy of WebView scale is less than density scale's one
  Fix Paint#measureText Tests
  Remove Some Broken Paint Tests
  Remove Broken Widget Tests
  Remove Broken WebKit Tests