Dan Morrill 5affe048ba Merge "Add a global-search column for last access."		2011-06-30 22:37:45 -07:00
cmds	KeyStore: fix test-keystore	2011-06-27 10:38:10 -07:00
include	Merge "Minor fix in SurfaceTexture"	2011-06-30 18:38:18 -07:00
libs	Merge "Minor fix in SurfaceTexture"	2011-06-30 18:38:18 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix screen on/off animation, which was flipped	2011-06-30 16:23:39 -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