Mathias Agopian 80728d87c9 Merge changes I9b8e1962,I7bb843ca ... * changes: Temporarily don't return the current buffer in synchronous mode unify SurfaceTexture and Surface		2011-06-13 17:20:53 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	unify SurfaceTexture and Surface	2011-06-13 15:51:35 -07:00
libs	Merge changes I9b8e1962,I7bb843ca	2011-06-13 17:20:53 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	unify SurfaceTexture and Surface	2011-06-13 15:51:35 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00