Jeff Brown fd8a76b9d1 am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2 ... * commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e': Refactor how timeouts are calculated. (DO NOT MERGE)		2011-05-26 11:38:48 -07:00
cmds	Support wrapping app processes to inject debug instrumentation.	2011-05-24 12:01:25 -07:00
include	SurfaceTexture: clean up some comments, tests, etc.	2011-05-25 12:27:33 -07:00
libs	SurfaceTexture: disable a failing test.	2011-05-25 12:27:33 -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