Robert Greenwalt ff85651004 resolved conflicts for merge of 3cd6a3e3 to master ... Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7		2010-05-26 10:37:48 -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	added the notion of fixed-size buffers	2010-05-24 18:26:01 -07:00
libs	Fix issue 2641884: Bluetooth volume is dependent on in call volume.	2010-05-25 09:31:59 -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
vcard	Small fix around intermideate charset (ISO-8859-1).	2010-05-21 17:11:09 -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	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