Nick Kralevich 15cb231c7d resolved conflicts for merge of cbf26fd3 to master ... Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6		2010-05-14 15:49:42 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Forgot to fix one -Wformat-security in my previous change. Fixed.	2010-05-14 10:29:13 -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	Merge "SharedBufferStack now can grow up to 16 buffers." into kraken	2010-05-12 17:36:46 -07:00
libs	am 900b6157: merge from open-source master	2010-05-14 15:12:17 -07:00
opengl	am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master	2010-05-12 12:16:45 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00