Mike Lockwood 609e1d9ac6 am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic ... * commit '8b1c74f96f93195326907db1bb07a3787a1c1b45': DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic		2011-05-04 08:57:56 -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