am 5fca46cb: am 7ada28d0: am d45ab47a: am cd71a272: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread

* commit '5fca46cbd13aefc9c5697ad593796b3432e5a309':
  Fix Build
  Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship
  Added sleep within testGetAndSetMasterSyncAutomatically.