Jean-Baptiste Queru 0ace3f4b92 resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp ... Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea		2010-10-11 09:38:10 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Added more robust tracking and cancelation of events.	2010-10-10 14:45:51 -07:00
libs	Added more robust tracking and cancelation of events.	2010-10-10 14:45:51 -07:00
opengl	am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread	2010-09-23 18:17:08 -07:00
services/surfaceflinger	am 19058877: Merge "refactored screenshot code" into gingerbread	2010-10-04 20:06:51 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00