Andreas Huber 5360b59d75 am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 ... * commit '7532ae7f79d6d849faae1a9bee171c66bd534d97': DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.		2011-03-16 13:36:35 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1	2011-03-15 13:44:58 -07:00
libs	SurfaceTexture: disallow unsupported uses.	2011-03-15 10:37:37 -07:00
opengl	SurfaceTexture: disallow unsupported uses.	2011-03-15 10:37:37 -07:00
services/surfaceflinger	SurfaceFlinger: Respect the PROTECTED gralloc bit.	2011-03-10 16:25:48 -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