Jamie Gennis 389ece6803 Merge changes I47f147f8,Id09915c9,Iabc6d27c ... * changes: SurfaceTexture: increase the test's Surface layer. SurfaceTexture: add some RGBA_8888 tests. SurfaceTextureClient: minor test refactoring.		2011-06-14 14:15:11 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	may fix build on some version of gcc	2011-06-14 11:50:22 -07:00
libs	SurfaceTexture: increase the test's Surface layer.	2011-06-14 13:45:53 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread	2011-06-13 18:39:45 -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