James Dong e4e5733bee resolved conflicts for merge of 1cbf8493 to master ... Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4		2011-03-16 15:53:03 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Add 3D mode key and others.	2011-03-16 11:31:42 -07:00
libs	Merge "Improve VelocityTracker numerical stability."	2011-03-15 20:01:16 -07:00
opengl	am 0ea44ac0: am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1	2011-03-15 13:01:27 -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	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