Go to file
Xavier Ducrohet 7ffa22b984 resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
2011-07-20 16:31:25 -07:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include 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
libs am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE) 2011-06-15 22:42:52 -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 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00