Dianne Hackborn 6e9bf4aba7 resolved conflicts for merge of 2eb12a47 to master ... Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99		2010-06-24 16:29:54 -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	Revert "Don't chdir into the keystore directory"	2010-06-19 04:44:22 +08:00
include	am e3e2883f: am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread	2010-06-23 10:32:25 -07:00
libs	am bc0793e4: am 03791188: Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread	2010-06-23 16:57:28 -07:00
opengl	am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.	2010-06-23 10:30:34 -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