Dianne Hackborn 5fb05853b9 resolved conflicts for merge of 8b625a95 to master ... Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba		2010-05-18 18:21:07 -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	fix some bugs in SharedBufferStack::resize	2010-05-17 17:27:26 -07:00
libs	add a few tests to SharedBufferStackTest	2010-05-17 20:08:22 -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	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