Adam Powell aca0345e25 Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1		2011-03-09 16:45:57 -08:00
cmds
include	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
libs	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	ANativeWindow: add queues-to-window-composer check.	2011-03-08 16:49:51 -08: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