commit | 7ada28d059e956664d25ca8fd699e6d03c3e1bee | [log] [tgz] |
---|---|---|
author | Brian Muramatsu <btmura@android.com> | Fri Apr 15 15:14:55 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 15 15:14:55 2011 -0700 |
tree | 4e5283847d3ea93a6928ef402e25940e109017b0 | |
parent | b37f255d69334b3391a8fed6071568c269b26637 [diff] | |
parent | d45ab47a58e1d9a25f4632650c5319b1f7b08323 [diff] |
am d45ab47a: am cd71a272: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'd45ab47a58e1d9a25f4632650c5319b1f7b08323': Fix Build Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Added sleep within testGetAndSetMasterSyncAutomatically.