Mike Lockwood c45fd5afb4 am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService ... * commit '0aa5d7b7f225236ac8461d0b6835b9c6152a2699': DO NOT MERGE Fix deadlock in MountService		2011-05-04 08:57:12 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
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	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00