tree 1b79e10d4de58cd9512b550135efc7e93ab1bec2
parent 1fef6339b35c7c5e18ec4122fc3019a13cba542a
parent 51c66b1b310d1e803da47fbe89bc9c79ec56a31b
author Brian Muramatsu <btmura@google.com> 1303121305 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303121305 -0700

am 51c66b1b: am 45ad581c: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit '51c66b1b310d1e803da47fbe89bc9c79ec56a31b':
  Parallelize Test Description Generalization
  Remove RequiredFeatures Annotation
  Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function.
  EGL Config Test
  Allow saving log files in different directory
  StartPreview only after setting fps range paramters
  Fix for the handling of SMS Delivery Report in case of CDMA network
  Fix WifiInfoTest
  Remove Unused Spec Progress Tool
  Fix Build
  Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship
  Added sleep within testGetAndSetMasterSyncAutomatically.