Scott Main ee6ceed44a resolved conflicts for merge of 5a726729 to gingerbread ... Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15		2010-11-10 14:46:44 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Drop all dispatcher state when dispatcher is disabled.	2010-10-27 18:43:51 -07:00
libs	Merge "fix [3148312] Region can access data out of bounds" into gingerbread	2010-11-08 13:40:40 -08:00
opengl	Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread	2010-11-10 14:09:17 -08:00
services/surfaceflinger	really fix [3118445] Transform * Transform does not work as expected	2010-10-27 18:04:11 -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
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00