Eric Fischer f75ad0db19 am d40e0efb: (-s ours) am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 ... * commit 'd40e0efb024ad2e276dbbd2eb81047dd2a1319f7': Import revised translations. DO NOT MERGE		2011-03-16 11:00:33 -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