Brad Fitzpatrick 43c79a0317 Merge "Avoid using String.format in MediaRecorder"		2011-01-24 13:36:15 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix getSwitchState.	2011-01-19 20:35:47 -08:00
libs	Fix getSwitchState.	2011-01-19 20:35:47 -08:00
opengl	am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread	2010-11-10 14:15:57 -08:00
services/surfaceflinger	am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:46:25 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00