Ramesh Sudini a49848ce58 am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type. ... * commit 'ea93d815ac33bf8ef0896b25fbf0185e6d6e82aa': Do not merge: Telephony: Fix config to reflect the correct CM conn type.		2011-03-14 13:49:21 -07:00
cmds
include	am e6f0ae12: am efd3266b: Input improvements and bug fixes.	2011-03-09 18:39:46 -08:00
libs	Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1	2011-03-10 18:06:32 -08:00
opengl	GLES2Debugger: Added DbgContext and vertex data capturing.	2011-03-10 16:40:37 -08:00
services/surfaceflinger	Fix some const-ness and comments	2011-03-11 17:01:40 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00