Nicolas Roard c7d2e82e7f resolved conflicts for merge of bfd6805a to master ... Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45		2010-05-11 10:40:11 -07:00
awt
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	Added definitions for the ways in which VoiceIME can be started.	2010-05-06 17:06:33 +01:00
include	am ca48c88c: am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo	2010-05-06 17:35:06 -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	Declare that testViewport targets Froyo APIs	2010-04-29 18:45:11 +08: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