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