Teng-Hui Zhu 9caddc886c am bcb14ce1: (-s ours) Compiling issue fix since SurfTex header changed. ... * commit 'bcb14ce1fc06ba7161e7e30420264dd0f2ad8433': Compiling issue fix since SurfTex header changed.		2011-10-01 12:01:46 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 5b98d3a7: am e91c8d04: Added interface to SurfaceTexture needed by WebKit.	2011-09-11 07:41:37 -07:00
libs	resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp	2011-07-29 14:16:18 -04:00
opengl	am be49703e: am d51ecafa: opengl: Ensure we only load the GLES emulation library when the emulator supports it.	2011-09-23 02:57:53 -07:00
services/surfaceflinger	am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 18:15:19 -07:00
vpn	VpnService: stop VPN when unknown DNS servers show up.	2011-07-08 17:59:54 -07: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