Jean-Baptiste Queru 42b42be2cd resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp ... Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5		2010-08-11 11:51:31 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	More native work.	2010-08-11 00:29:59 -07:00
libs	More native work.	2010-08-11 00:29:59 -07:00
opengl	am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread	2010-08-10 13:52:58 -07:00
services/surfaceflinger	am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"	2010-08-11 10:16:32 -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