Fred Quintana 44888afd89 resolved conflicts for merge of ae0cf6dc to eclair-mr2		2009-11-11 16:18:46 -08:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Hold a lock while we access the preview heap.	2009-11-06 11:47:13 -08:00
cmds	keystore: remove old implementation and test.	2009-09-24 13:35:26 +08:00
include	Merge change I36d0184e into eclair	2009-11-02 21:26:54 -05:00
libs	AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.	2009-11-09 04:45:39 -08:00
opengl	am c421fc2a: Merge change Id09376d1 into eclair	2009-11-09 19:34:59 -08:00
vpn/java/android/net/vpn	Remove deprecated VpnType.getDescription().	2009-09-30 18:39:48 +08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Start using CLDR for some date-and-time strings and formats.	2009-05-15 10:15:50 -07:00