Stephen Hines 5cfbe30b36 am 89254a11: am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1 ... * commit '89254a114bac016bbc9974c392d40804da0eb174': 2X2 matrix needs 4 float elements.		2011-03-15 23:50:34 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Improve VelocityTracker numerical stability."	2011-03-15 20:01:16 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00