Mike Lockwood 70e3799cc0 am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked() ... * commit '1b8956398be6aeacf0383d8e0931771dbd3a6d2b': DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()		2011-02-26 13:33:12 -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	Merge "Correctly handle translucency of device-specific pixel formats"	2011-02-23 14:10:04 -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