Robert Greenwalt 43bba34d59 resolved conflicts for merge of ee09dc67 to master ... Change-Id: I8b0b595580d9c6d44b84e636012705dc913fa6ac		2010-06-08 10:10:54 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Merge "Disable CameraServiceTest in a normal build." into kraken	2010-05-23 21:04:01 -07:00
cmds	keystore: rephrase the comment to make the usage more clear.	2010-03-17 16:31:20 +08:00
common	am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo	2010-05-12 19:12:53 -07:00
include	am f5f7d389: am fae5cb2b: optimize Surface.readFromParcel()	2010-06-04 19:17:16 -07:00
libs	am f5f7d389: am fae5cb2b: optimize Surface.readFromParcel()	2010-06-04 19:17:16 -07:00
opengl	am df9556f3: am 23100fd1: Merge "fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig" into kraken	2010-05-17 14:59:13 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07: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