Marco Nelissen e33624bfae Resolve conflicts for commit '3ce65633' ... Change-Id: I7ad67f68ce30a9fc4492f8291eded28d19aa65dd		2010-08-05 11:23:14 -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 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread	2010-08-04 11:12:32 -07:00
libs	am 3b724c83: am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread	2010-07-30 14:52:12 -07:00
opengl	am d12a98e2: am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread	2010-08-04 11:12:25 -07:00
services/surfaceflinger	fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.	2010-07-27 20:11:35 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00