Xavier Ducrohet 754b249bcd am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" ... * commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1': Fix String16 operator+ to actually work		2011-08-17 14:38:15 -07:00
cmds	Support wrapping app processes to inject debug instrumentation.	2011-07-28 14:00:27 -07:00
include	am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"	2011-08-17 14:38:15 -07:00
libs	resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp	2011-07-29 14:16:18 -04:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 18:15:19 -07:00
vpn	VpnService: stop VPN when unknown DNS servers show up.	2011-07-08 17:59:54 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00