Robert Ly 149c6670e7 am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 ... * commit 'c7731e070e09007fdd002fd44dfe35bdeffbaac5': cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d		2011-06-14 17:47:51 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	DO NOT MERGE. may fix build on some version of gcc	2011-06-14 12:05:42 -07:00
libs	fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 13:44:28 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 13:44:28 -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