Scott Main 8f427883ac am b5d35088: resolved conflicts for merge of b842629c to honeycomb-plus-aosp ... * commit 'b5d35088cbbbac53b052ec52f199de4ad8b061e7': docs: update sizes and sums for tools and ndk		2011-02-18 19:49:10 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix a regression with MotionEvent parceling.	2011-02-17 13:01:34 -08:00
libs	Fix a regression with MotionEvent parceling.	2011-02-17 13:01:34 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	fix a surface leak in SurfaceFlinger	2011-02-16 15:31:07 -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