tree 91261cef3ff4bffe7849b740cf7b73443ce782cb
parent 76aa79e5343105f77959c1eb3de5452b4aae4016
parent 10cf2ff3ef8972c0056344db9be33e3d201ec510
author Brian Muramatsu <btmura@android.com> 1295566115 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295566115 -0800

am 10cf2ff3: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread

* commit '10cf2ff3ef8972c0056344db9be33e3d201ec510':
  fix NoCallPermission tests for non-telephony devices
  Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices
  fix sms testcases for non-telephony devices
  Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
  fix test for non-telephony devices
  Use Vogar Expectations to Clean Up Remaining Tests
  fix keytests for azerty keyboard
  The layout height should be the value scaled by the density.
  Set ChromeClient to webview to gurantee the getprogress() value
  100ms does not gurantee trigerring the audio. the test always passed with 200ms
  Remove Broken NoActivityRelatedPermissionTest
  fix WQVGA resolution