Andreas Huber 5840c57350 Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)""		2011-02-15 15:56:20 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am c6c3e77d: am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb	2011-02-10 15:46:15 -08:00
libs	am c7839751: am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb	2011-02-07 13:47:02 -08:00
opengl	Merge "Clear all EGL errors when entering EGL funcs."	2011-01-31 15:40:06 -08:00
services/surfaceflinger	am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb	2011-02-02 16:46:46 -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 adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00