Kenny Root c2625b69a3 resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp ... Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c		2011-01-26 11:10:36 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix crashes caused by some input devices.	2011-01-25 16:02:22 -08:00
libs	am 4707dc73: am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread	2011-01-21 10:15:34 -08:00
opengl	egl: clear error on function entry	2011-01-25 15:36:21 -08:00
services/surfaceflinger	tone down the log spew regarding taking screenshots.	2011-01-24 18:13:54 -08: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 adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00