Brian Carlstrom 64db2ebe38 Merge "Revert "Add keychain user with special keystore access permissions""		2011-07-01 13:43:37 -07:00
cmds	Revert "Add keychain user with special keystore access permissions"	2011-06-30 22:59:13 -07:00
include	Merge "Minor fix in SurfaceTexture"	2011-06-30 18:38:18 -07:00
libs	Merge "Minor fix in SurfaceTexture"	2011-06-30 18:38:18 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix screen on/off animation, which was flipped	2011-06-30 16:23:39 -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