Dianne Hackborn 7e4c1982d3 am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 ... * commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6': Add ParcelFileDescriptor.fromFd() and .adoptFd().		2011-05-20 14:32:35 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Add new "-swNNNdp" resource qualifier.	2011-05-19 18:23:29 -07:00
libs	Add new "-swNNNdp" resource qualifier.	2011-05-19 18:23:29 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:32:25 -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