Go to file
Dianne Hackborn 3ff09c8d9d am 1e6f5f04: am c3d0d860: Merge "Make the Phone options dialog use current language"
* commit '1e6f5f0453a2be0553de39c3b6f97da7c66b0b3b':
  Make the Phone options dialog use current language
2011-01-14 21:29:48 -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 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