Mike Lockwood e5f7a9501f am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods ... * commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091': DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods		2011-05-04 08:57:07 -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	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE