Dheeraj Sharma a1ff4e5645 Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb		2011-01-30 15:08:12 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Reset ANativeWindow crop on buffer geometry changes.	2011-01-28 18:21:54 -08:00
libs	Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb	2011-01-30 15:00: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 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00