Irfan Sheriff 863052f25b am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread ... Merge commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9' * commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9': fix getmacaddress race condition (don't auto-merge)		2010-10-11 10:49:39 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Move binder magic from the Surface class to GraphicBuffer."	2010-10-10 13:36:13 -07:00
libs	Merge "Move binder magic from the Surface class to GraphicBuffer."	2010-10-10 13:36:13 -07:00
opengl	libagl: eglSwapInterval fix	2010-10-06 16:44:37 -07:00
services/surfaceflinger	fix a bug where timeouts would only be handled when a message was delivered	2010-10-07 19:59:06 -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