Xavier Ducrohet 1b6c1b73d1 am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 ... * commit 'f6e479993e7c85265692829990ceb3879fbce424': Import the Layoutlib from hc-mr1.		2011-06-06 18:11:33 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -07:00
libs	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00