commit | 05dde7f454340af20972abe1437eaf1ab97c1cef | [log] [tgz] |
---|---|---|
author | Brian Muramatsu <btmura@android.com> | Fri Apr 15 17:33:22 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 15 17:33:22 2011 -0700 |
tree | 065eb24788551f24f8f4228ea7e24b31788cfb92 | |
parent | 4263db43b12c670603c1fbac33d9555fd991381b [diff] | |
parent | 5fca46cbd13aefc9c5697ad593796b3432e5a309 [diff] |
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.