Fabrice Di Meglio 04fc3f9d21 Merge "Update BiDiTest app"		2011-06-02 16:37:32 -07:00
cmds	Integrating keystore with keyguard (Part 1 of 4)	2011-06-01 14:29:59 -07:00
include	am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2	2011-06-02 16:24:12 -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