Dianne Hackborn f7f7c5bede am b69c4e36: am 544ff558: am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread ... * commit 'b69c4e36bec6bfd66e9d67ee3a5befab98ff9e64': Added check to make orientation calculations more robust		2011-01-16 10:43:32 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb	2011-01-14 19:27:32 -08:00
libs	Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb	2011-01-14 19:27:32 -08:00
opengl	Hardware Composer Test hwcCommit set blend type	2011-01-10 18:03:05 -08:00
services/surfaceflinger	Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb	2011-01-14 19:27:38 -08:00
vpn	Revert "Remove the APIs for the old encryption scheme."	2011-01-13 14:15:43 -06:00
MODULE_LICENSE_APACHE2
NOTICE	Fix merge conflict for 'c506ab89'	2011-01-13 11:48:42 -08:00