Mathias Agopian 8d5ed61121 am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread ... Merge commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp * commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c': fix a bug where timeouts would only be handled when a message was delivered		2010-10-11 12:44:23 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Added more robust tracking and cancelation of events.	2010-10-10 14:45:51 -07:00
libs	Added more robust tracking and cancelation of events.	2010-10-10 14:45:51 -07:00
opengl	am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread	2010-09-23 18:17:08 -07:00
services/surfaceflinger	am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread	2010-10-11 12:44:23 -07: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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00