Robert Ly c8391fcee6 am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 ... * commit '4963cd0bd1d63fe5a444b2299758d2a2696776f1': cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc		2011-06-14 17:51:08 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc	2011-06-14 13:30:34 -07:00
libs	am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 14:15:00 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-13 14:15:00 -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