satok 33ed52c710 Merge "Fix NPE in getLastInputMethodSubtype"		2011-07-04 21:48:47 -07:00
cmds	Revert "Add keychain user with special keystore access permissions"	2011-06-30 22:59:13 -07:00
include	Workaround apps that make assumptions about pointer ids.	2011-07-01 19:08:15 -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
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00