Tom Taylor 366cd9b7e9 am 92010ff5: am dbac180d: Fix a merge problem with html mms ... Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp * commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9': Fix a merge problem with html mms		2010-07-21 11:26:17 -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	Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread	2010-07-16 15:14:44 -07:00
libs	Remove some debug logging that I accidentally committed.	2010-07-19 16:09:26 -07:00
opengl	am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread	2010-07-02 12:34:22 -07:00
services/surfaceflinger	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -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