The Android Open Source Project 7b880ae492 merge from open-source master ... Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa		2010-05-12 14:54:38 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Still do dump() if we cannot get mServiceLock for a while.	2010-03-05 15:21:02 -08:00
cmds	keystore: rephrase the comment to make the usage more clear.	2010-03-17 16:31:20 +08:00
common	Bug 2673557: rename datamessaging	2010-05-10 19:12:49 -07:00
include	am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo	2010-05-06 17:33:45 -07:00
libs	fix [2664345] Flash: Bad flicker at the end of a pinch zoom.	2010-05-06 20:21:45 -07:00
opengl	merge from open-source master	2010-05-12 11:58:14 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07: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