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

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