Jean-Baptiste Queru d26e345f29 resolved conflicts for merge of f601ce2c to master ... Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7		2010-07-02 07:46:21 -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 377e2352: am 7f8edbd9: Merge "remove unused YUV formats" into gingerbread	2010-07-01 21:34:05 -07:00
opengl	resolved conflicts for merge of f601ce2c to master	2010-07-02 07:46:21 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00