Jeff Brown a16d82c248 am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread ... Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp * commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32': Added more robust tracking and cancelation of events.		2010-10-10 14:50:38 -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 19058877: Merge "refactored screenshot code" into gingerbread	2010-10-04 20:06:51 -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