Hung-ying Tyan f529ff4c45 Merge "Make NAT port timeout measurement more flexible."		2011-06-30 03:04:58 -07:00
cmds	KeyStore: fix test-keystore	2011-06-27 10:38:10 -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	SF transactions are now O(1) wrt IPC instead of O(N).	2011-06-29 15:05:41 -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