Go to file
Brian Carlstrom e709d94a29 Merge "Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)" 2011-06-26 15:30:37 -07:00
cmds Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore) 2011-06-23 02:10:23 -07:00
include Add allowSynchronousMode to SurfaceTexture constructor. 2011-06-23 21:21:47 -07:00
libs Merge "Fix settings restore" 2011-06-24 15:15:51 -07:00
opengl fix x86 build 2011-05-23 17:48:36 -07:00
services/surfaceflinger fix RefBase so it retains binary-compatibility with gingerbread 2011-06-13 18:39:45 -07: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