Dianne Hackborn e4ab0a6661 resolved conflicts for merge of 872a1e79 to master ... Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74		2011-06-16 16:01:27 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	Use rand() for MinGW	2011-06-15 20:55:49 -07:00
libs	Use rand() for MinGW	2011-06-15 20:55:49 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread	2011-06-13 18:39:45 -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