Christopher Tate 6764eff2f7 resolved conflicts for merge of d3233ae9 to master ... Change-Id: I59ecf8f2d3bd253f51457c11ec15f022ac5fdeb6		2010-07-01 11:49:41 -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 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread	2010-06-30 16:11:21 -07:00
libs	am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread	2010-06-30 16:11:21 -07:00
opengl	am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread	2010-06-30 16:11:21 -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