Jeff Brown 04c1a8cdec resolved conflicts for merge of 9e660c82 to master ... Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43		2010-06-13 19:16:55 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Change camera interface to support multiple cameras.	2010-06-11 16:47:33 +08: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	resolved conflicts for merge of 9e660c82 to master	2010-06-13 19:16:55 -07:00
libs	resolved conflicts for merge of 9e660c82 to master	2010-06-13 19:16:55 -07:00
opengl	am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken	2010-06-09 19:57:01 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00