Dianne Hackborn 37cb1b9f25 am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 ... * commit 'fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6': Fix some problems with moving in and out of detached state.		2011-06-10 18:39:48 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Enforce public resource restriction on bag parents.	2011-06-09 15:27:39 -07:00
libs	Enforce public resource restriction on bag parents.	2011-06-09 15:27:39 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	fix a surface leak introduced by a failed merge (DO NOT MERGE)	2011-06-07 14:52:22 -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