Nick Pelly 39328e03d9 am 29f9ee97: Merge "Need to check ndef before writing ndef." into gingerbread ... * commit '29f9ee973eefea3c68382ed38e69db1f1a396f3f': Need to check ndef before writing ndef.		2010-12-20 11:29:40 -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 e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread	2010-12-08 16:20:23 -08:00
services/surfaceflinger	am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread	2010-12-08 16:15:08 -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