Robert Ly b41a023a5c am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 ... * commit '329e0b9020f3b8cd1265c265cdf00b438960cbe1': cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb		2011-06-20 09:44:55 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 17:22:28 -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 "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 17:22:28 -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