Jake Hamby 1b32c3b473 resolved conflicts for merge of 7ca13deb to master ... Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae		2011-06-08 23:20:09 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-07 17:52:30 -07:00
libs	Merge "Fix handling of directory entries"	2011-06-08 20:13:57 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge "Fix a race that could cause GL commands to be executed from the wrong thread."	2011-05-19 19:42:20 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE