Dharmaray Kundargi 357fe41a00 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp		2011-01-30 16:35:08 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb	2011-01-30 15:03:03 -08:00
libs	am 1314bdb2: am e88fa50b: Merge from open-source gingerbread	2011-01-30 16:32:44 -08:00
opengl	egl: clear error on function entry	2011-01-25 15:36:21 -08:00
services/surfaceflinger	Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb	2011-01-30 15:00:44 -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