| commit | 3905bc6ca3a2f29d2eb3fc9086ca0078f39c6829 | [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 | 101ae9208fa8c4e9a0b704cec6807a95e1152552 | |
| parent | 36b0b85abd20b4f4bea210060dec3fbe80870dd5 [diff] | |
| parent | be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d [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.