Jason Chen 83bc093ce8 am 36b0b85a: (-s ours) am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread ... * commit '36b0b85abd20b4f4bea210060dec3fbe80870dd5': DO NOT MERGE Cherry-pick of Ie4026a7c back to GB		2011-02-23 18:11:21 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Remove RefBase.h dependency on TextOutput.h	2011-02-22 18:08:58 -08:00
libs	Remove RefBase.h dependency on TextOutput.h	2011-02-22 18:08:58 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	Merge "Correctly handle translucency of device-specific pixel formats"	2011-02-23 14:10:04 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +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 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00