Wink Saville 88c3386cfa am 5cf1dbec: (-s ours) am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1 ... * commit '5cf1dbec1b1d534863f03fc166c7289c4a9d399c': DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"		2011-03-04 01:01:04 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00