Xavier Ducrohet 30f659aae9 am e1918353: am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread ... * commit 'e1918353e795d4f4fb67760ad593458517976072': Bring in more layout lib changes from hc-mr1.		2011-06-28 19:15:32 -07:00
cmds	KeyStore: fix test-keystore	2011-06-27 10:38:10 -07:00
include	Merge changes I9fb59763,I8b2c6e00	2011-06-28 12:55:03 -07:00
libs	SurfaceTexture: add a CPU -> GL sync test.	2011-06-28 13:18:07 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge changes I9fb59763,I8b2c6e00	2011-06-28 12:55:03 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE