| commit | 8097bccfd9c8dcb3a1d10bcf7691b59e6e1ea814 | [log] [tgz] |
|---|---|---|
| author | repo sync <aalbert@google.com> | Thu Feb 24 10:26:49 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 24 10:26:49 2011 -0800 |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
| parent | cba9291560815b5d713392e916902dfd0ad91eed [diff] | |
| parent | 492301161bdc47a826ce9910dfd81d833671b374 [diff] |
am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp * commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d': DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.