Jean-Baptiste Queru 954d2d5fae am 44e43d1f: resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp ... Merge commit '44e43d1f6593ae912b3818692058196233cd4ac9' * commit '44e43d1f6593ae912b3818692058196233cd4ac9': InputMethodManagerService: Fix acore crash on boot up		2010-08-11 12:35:30 -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	am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread	2010-08-11 00:50:56 -07:00
libs	am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread	2010-08-11 00:50:56 -07:00
opengl	am 553a333d: am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread	2010-08-10 13:55:34 -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	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00