Alon Albert c96b669013 Merge "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." into gingerbread

2011-02-24 09:20:46 -08:00

..

config

…

java

Merge "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." into gingerbread

2011-02-24 09:20:46 -08:00

jni

Do not merge.

2011-01-11 22:54:10 -08:00

res

Merge "Import revised translations. DO NOT MERGE" into gingerbread

2011-02-17 17:17:40 -08:00

tests

Do not check features in PackageManagerService DO NOT MERGE

2011-01-31 16:27:38 -08:00