Brad Fitzpatrick 987c90d7a1 resolved conflicts for merge of 14d151bf to master ... Change-Id: Ib1ac9acfd6dc71b5fa4e1456a056d1e9dee65fda		2010-10-12 13:12:18 -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	Always create OpenGL accelerated windows in RGBA 8888.	2010-10-12 11:00:18 -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
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00