Chia-chi Yeh 864bf3be69 Merge "VPN: tolerate duplicated routes."		2011-06-13 16:17:03 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	Merge "libutils: add a binary blob cache implementation."	2011-06-13 12:32:46 -07:00
libs	Merge changes Ic9186db2,Id5a7cdff	2011-06-13 14:48:11 -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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00