Alon Albert 1f3dcff801 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
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)	2011-01-25 14:19:13 -08:00
libs	Merge from open-source gingerbread	2011-01-30 15:30:03 -08:00
opengl	egl: fixes for object refcounts	2011-02-22 18:15:08 -08:00
services/surfaceflinger	fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)	2011-01-25 14:19:13 -08:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00