Scott Main 0d308338e8 resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp ... Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab		2011-01-26 18:47:13 -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	fix [3385504] Surface flinger hang when adding dim surface	2011-01-25 20:52:46 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00