Jeff Brown daf2765b50 Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2		2011-05-25 14:32:05 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Refactor how timeouts are calculated. (DO NOT MERGE)	2011-05-23 17:20:42 -07:00
libs	Refactor how timeouts are calculated. (DO NOT MERGE)	2011-05-23 17:20:42 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:32:25 -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