Gloria Wang 49bcf3e8b6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp ... Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455		2010-11-02 14:02:59 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Drop all dispatcher state when dispatcher is disabled.	2010-10-27 18:43:51 -07:00
libs	Fix bugs related to cheek event suppression.	2010-11-01 20:51:58 -07:00
opengl	am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread	2010-10-26 12:19:43 -07:00
services/surfaceflinger	am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:46:25 -07: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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00