Ying Wang e00b371d62 Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge ... Conflicts: core/res/res/values/public.xml Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1		2010-09-07 18:39:03 -07:00
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 05dff838: am 11bbe200: Hopefully fix the build.	2010-09-07 14:48:28 -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	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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00