Gloria Wang a34207b4f2 resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp ... Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76		2010-10-07 15:27:17 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Make secure views tolerate IME overlays.	2010-10-05 12:26:23 -07:00
libs	Make secure views tolerate IME overlays.	2010-10-05 12:26:23 -07:00
opengl	am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread	2010-09-23 18:17:08 -07:00
services/surfaceflinger	am 19058877: Merge "refactored screenshot code" into gingerbread	2010-10-04 20:06:51 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE