Kenny Root 61bfd84daf Merge "Clean up use of HAVE_ANDROID_OS"		2011-02-16 12:33:28 -08:00
cmds
include	am c6c3e77d: am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb	2011-02-10 15:46:15 -08:00
libs	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb	2011-02-02 16:46:46 -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