The Android Open Source Project 2bfc6fb6bc resolved conflicts for merge of fe953c43 to master ... Change-Id: Iedf5b55f97f938242e25bcf5098982b2d3e43c68		2010-05-12 15:22:06 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Force sooner/generic/sim to use camera stub only.	2010-05-10 15:04:40 +08:00
cmds	keystore: rephrase the comment to make the usage more clear.	2010-03-17 16:31:20 +08:00
common	am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo	2010-05-12 09:24:20 -07:00
include	Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken	2010-05-11 12:25:31 -07:00
libs	am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo	2010-05-10 09:49:19 -07:00
opengl	am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master	2010-05-12 12:16:45 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00