Martijn Coenen 4bcd592df7 Merge "Support for setting the NfcA transceive timeout (API)."		2011-06-13 12:19:01 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8	2011-06-13 11:14:57 -07:00
libs	Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8	2011-06-13 11:14: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
MODULE_LICENSE_APACHE2
NOTICE