John Wang 3c44627702 Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2		2011-06-16 16:47:18 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)	2011-06-15 20:45:32 -07:00
libs	revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)	2011-06-15 20:45:32 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)	2011-06-15 20:45:32 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00