Irfan Sheriff 2de4863141 am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 ... * commit 'e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa': Backup and restore IP and proxy settings		2011-03-14 11:50:38 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Input improvements and bug fixes.	2011-03-09 18:30:28 -08:00
libs	Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1	2011-03-10 18:06:32 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	SurfaceFlinger: Respect the PROTECTED gralloc bit.	2011-03-10 16:25:48 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00