Irfan Sheriff 2f28b822da resolved conflicts for merge of 52556689 to gingerbread-plus-aosp ... Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a		2010-12-01 10:40:05 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI"	2010-11-17 17:29:48 -08:00
libs	am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"	2010-11-23 11:14:57 -08:00
opengl	am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread	2010-11-10 14:15:57 -08:00
services/surfaceflinger	am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:46:25 -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