Brad Fitzpatrick b981442d41 am b41c37ee: am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code." ... * commit 'b41c37eec16d030563829108d8c77a9c14931991': Fixing self-assignment in copying code.		2011-03-15 12:07:27 -07:00
cmds
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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00