satok ca268875c1 am d145249b: (-s ours) am c91437d3: do not merge: Cherry pick change I878192090 from master. ... * commit 'd145249b4f7b32cd7f78899fd64ebb91e42389ef': do not merge: Cherry pick change I878192090 from master.		2011-03-03 17:25:12 -08:00
cmds
include	Merge "Add TextLayout Cache"	2011-03-03 12:21:15 -08:00
libs	Wake screen from external HID peripherals.	2011-03-02 19:57:07 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	remove some logs	2011-03-02 18:45:50 -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