Eric Laurent cd708a9b4b am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2 ... Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2 * commit 'a47d153647d8750b667942ad80e7b905ea98c68b': do not merge - Fix for issue 2184627 cherry picked from eclair-mr2		2009-10-28 10:26:33 -07:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Don't callback on NULL client. Bug 2180510.	2009-10-15 15:18:08 -07:00
cmds	keystore: remove old implementation and test.	2009-09-24 13:35:26 +08:00
include	fix [2182249] [MR1] valgrind error in surface flinger	2009-10-15 18:08:15 -07:00
libs	Merge change Icf10db28 into eclair	2009-10-24 04:32:28 -04:00
opengl	am 8f89a1a3: Merge change Ic620a52b into eclair	2009-10-23 17:39:47 -07: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