Robert Greenwalt 5bf7250ab7 resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp ... Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3		2011-07-27 09:27:00 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread	2011-06-28 18:53:51 -07:00
libs	am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."	2011-07-25 12:21:06 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)	2011-06-16 18:15:19 -07:00
vpn	VpnService: stop VPN when unknown DNS servers show up.	2011-07-08 17:59:54 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00