Jake Hamby 1f95efb97f Merge "Fix race condition in WakeLocks."		2011-06-27 14:54:24 -07:00
cmds	KeyStore: fix test-keystore	2011-06-27 10:38:10 -07:00
include	MemoryHeapBase: Save and binderize the offset	2011-06-27 13:48:51 -07:00
libs	MemoryHeapBase: Save and binderize the offset	2011-06-27 13:48:51 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread	2011-06-13 18:39:45 -07: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