am f0180049: am 22934f4c: am 8fcbb1ce: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread

* commit 'f018004925dc80f2a6474548df4598df89ff42f6':
  Ignore Tests with Side Effects
  Added view.invalidate() in testComputeScroll.
  Increase time interval in points provided to VelocityTracker
  Froyo-specific startcts Fixes
  Revert "Allow 2.2.3 for Build.VERSION"
  Increment CTS Version to 2.2_r5
  Allow 2.2.3 for Build.VERSION
  CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize
  Adding DelayedCheck() in testHasWindowFocus.
  Adding DelayedCheck() in testInputConnection.
  Add test to verify an uninstall of app wipes its data.
  Modified so that if network does not support multipart / data SMS, it skips this test.
  Add wait in testOnWindowFocusChanged.