Adam Powell e48a855dc7 am 9b90ac3b: am efb9000f: Fix bug 3355197 - TextView error popup text color ... * commit '9b90ac3b06a5536df9a5beb4a0d36b708df385f3': Fix bug 3355197 - TextView error popup text color		2011-01-16 10:46:00 -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	Compare GraphicBuffers using handles.	2011-01-15 17:00:06 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Fix merge conflict for 'c506ab89'	2011-01-13 11:48:42 -08:00