Android Git Automerger c1bf2237ca am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp ... * commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':		2012-02-28 10:51:35 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	move CursorWindow from libbinder to libandroidfw	2012-02-27 18:11:20 -08:00
libs	Merge "move CursorWindow from libbinder to libandroidfw"	2012-02-27 19:48:21 -08:00
opengl	Add tracing to various graphics components.	2012-02-27 17:50:35 -08:00
services/surfaceflinger	Merge "a window could get stuck to gpu composition"	2012-02-27 19:48:36 -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