Dianne Hackborn 661a8c37c8 Merge "You can now specify a custom display size as NxM."		2011-02-28 11:28:38 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"	2011-02-25 15:18:53 -08:00
libs	Merge "Fix some issues with RefBase debugging."	2011-02-24 16:23:51 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread	2011-02-27 16:04:42 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00