Jeff Brown 26dbf44c66 resolved conflicts for merge of f2e0681a to master ... Change-Id: I5ba9b1f16a29f73444123bcead4c53f09a79b0f6		2010-10-12 18:19:08 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Always create OpenGL accelerated windows in RGBA 8888.	2010-10-12 11:00:18 -07:00
libs	Track input state when transferring touch focus.	2010-10-11 18:32:20 -07:00
opengl	libagl: eglSwapInterval fix	2010-10-06 16:44:37 -07:00
services/surfaceflinger	am 5d477279: am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread	2010-10-12 13:57:09 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00