Brad Fitzpatrick f33938da11 am 6f80f395: am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." ... * commit '6f80f395b71cb641b77097e14a1906c7842c9ba6': Removing repetitive conditional; it simply does nothing except slowing down things.		2011-03-15 11:44:46 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am c570ee21: am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1	2011-03-15 10:45:01 -07:00
libs	am c570ee21: am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1	2011-03-15 10:45:01 -07:00
opengl	Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"	2011-03-14 16:58:05 -07: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	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