Dirk Dougherty 9051917e46 am b079c1f8: am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 ... * commit 'b079c1f8ee41e714b5273189014a5601598a8b62': Doc change: update media formats tables with adts/aac and flac		2011-04-03 14:01:40 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "SurfaceTexture can now force the client to request a buffer"	2011-04-01 14:58:43 -07:00
libs	Merge "Fix dispatcher crash when input monitoring enabled. Also ensure that we actually log assertion failures."	2011-04-01 16:33:40 -07:00
opengl	Initialize reference counter for egl_display_t	2011-03-31 16:52:02 -07:00
services/surfaceflinger	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -07: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