Gilles Debunne c4dba0be3c Merge "Fix for NPE when dragging on TextView"		2012-02-27 15:28:49 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	Merge "libutils: add a system-wide tracing utility"	2012-02-27 13:35:30 -08:00
libs	Merge "libutils: add a system-wide tracing utility"	2012-02-27 13:35:30 -08:00
opengl	libagl shouldn't export anything	2012-02-27 13:03:04 -08:00
services/surfaceflinger	fix libgui header location	2012-02-27 13:03:08 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00