Dianne Hackborn 738f04edca resolved conflicts for merge of cc20b4e3 to master ... Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4		2011-06-03 15:01:49 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	resolved conflicts for merge of 54cb63e2 to master	2011-06-02 16:44:52 -07:00
libs	Restore from a previous full backup's tarfile	2011-06-01 15:09:55 -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