Robert Ly cb02939f1a am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 ... * commit '8a8f82bbd606657df8a804b4cd499556e2292404': cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc		2011-06-14 20:57:07 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	may fix build on some version of gcc	2011-06-14 11:50:22 -07:00
libs	Merge "Bug 4608375"	2011-06-14 17:54:25 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread	2011-06-13 18:39:45 -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 adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00