Chung-yih Wang edf16716c8 resolved conflicts for merge of a329aef4 to master ... Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c		2010-09-01 11:00:33 +08:00
awt
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	am df02df11: am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread	2010-08-31 15:53:17 -07:00
libs	am df02df11: am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread	2010-08-31 15:53:17 -07:00
opengl	Add KHR_gl_texture_2D_image extension string.	2010-08-27 16:08:03 -07:00
services/surfaceflinger	am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread	2010-08-25 16:40:28 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00