Nick Pelly 1f5a356bd1 am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread ... * commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8': Implemented getSize() to return max ndef size.		2010-12-07 22:57:23 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread	2010-12-07 14:22:56 -08:00
libs	am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread	2010-12-07 14:22:56 -08:00
opengl	am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread	2010-12-06 18:22:57 -08:00
services/surfaceflinger	am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread	2010-12-07 14:22:56 -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	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