Brian Carlstrom e0cd5dc3dc Revert "Add keychain user with special keystore access permissions" ... This reverts commit 8c2a1a90a81f04573bfa578eab32f5fd4a30eafb. Conflicts: cmds/keystore/keystore.c Bug:4970237 Change-Id: I626023d695becfada47e5f319b18e0889b766563		2011-06-30 22:59:13 -07:00
cmds	Revert "Add keychain user with special keystore access permissions"	2011-06-30 22:59:13 -07:00
include	Merge "SF transactions are now O(1) wrt IPC instead of O(N)."	2011-06-29 16:15:56 -07:00
libs	Merge "SF transactions are now O(1) wrt IPC instead of O(N)."	2011-06-29 16:15:56 -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