Irfan Sheriff f79f276ab0 am 869fa653: (-s ours) resolved conflicts for merge of 52556689 to gingerbread-plus-aosp ... * commit '869fa653e0880fc1f389eb51524bef5183bf713e': DO NOT MERGE Fix status fetch from supplicant		2010-12-01 11:20:52 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Ensure the ShortcutManager uses the correct key character map.	2010-11-30 18:50:17 -08:00
libs	Ensure the ShortcutManager uses the correct key character map.	2010-11-30 18:50:17 -08:00
opengl	Hardware Composer Stress Test	2010-11-29 14:08:57 -08:00
services/surfaceflinger	Merge "Implement reducing the buffer count of a Surface."	2010-11-11 15:26:21 -08:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00