Mike Lockwood b1771c1290 am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files ... * commit 'fdb50e6f8eaac31010b64fc79a60dacb5f776613': DO NOT MERGE MTP: Add extended operations to support in-place editing of files		2011-05-04 08:57:41 -07:00
cmds
include	resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp	2011-04-12 10:27:15 -07:00
libs	Merge "Implement support for ALT and SHIFT modifiers"	2011-04-29 09:59:55 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"	2011-04-29 17:15:35 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE