Dianne Hackborn 086dd3377c am c388844d: (-s ours) am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.* ... Merge commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d' * commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d': DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*		2010-09-24 18:10:18 -07:00
cmds	move native services under services/	2010-07-22 15:28:19 -07:00
include	am 3e07c000: am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbread	2010-09-24 15:22:38 -07:00
libs	am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread	2010-09-24 15:58:25 -07:00
opengl	am 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread	2010-09-23 21:41:30 -07:00
services/surfaceflinger	dump HWC state in dumpsys	2010-09-23 18:13:21 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07: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