Xavier Ducrohet 23d088139d am 68957a0d: (-s ours) am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. ... * commit '68957a0d7516c82b8cb4050f15294c663bf08338': Merge 67450db0 from honeycomb. Do not merge.		2011-03-17 16:27:42 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Add support for timestamps into SurfaceTexture."	2011-03-17 15:52:34 -07:00
libs	Merge "Add support for timestamps into SurfaceTexture."	2011-03-17 15:52:34 -07:00
opengl	Merge "GLES2Debugger: Make command exchange async to improve performance."	2011-03-17 14:38:37 -07:00
services/surfaceflinger	am e22aa623: am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out	2011-03-17 00:13:49 -07: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