Irfan Sheriff 00ff0ca922 am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 ... * commit '9b1ea0bd2c9af64c424fa4fef327108cb376b74f': Backup and restore IP and proxy settings		2011-03-14 11:56:03 -07:00
cmds
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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00