Commit d45ab47a authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

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

* commit 'cd71a272':
  Fix Build
  Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship
  Added sleep within testGetAndSetMasterSyncAutomatically.
parents 2a0a5251 cd71a272
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment