Dianne Hackborn ab32c11fd2 am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo ... Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp * commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6': Properly note the current active restore set's token		2010-06-24 16:02:03 -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
include	am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo	2010-05-06 17:33:45 -07:00
libs	Fix isssue 2548710: Native AudioTrack resources never freed.	2010-05-18 14:18:57 -07:00
opengl	merge from open-source master	2010-06-15 11:34:57 -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