Robert Greenwalt 6799c31658 resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp ... Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1		2011-03-30 15:03:13 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out	2011-03-17 00:04:42 -07:00
libs	fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out	2011-03-17 00:04:42 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:32:25 -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