Marco Nelissen 11398d6aac am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2 ... Merge commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7' into eclair-mr2-plus-aosp * commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7': - add javadoc for the account manager		2009-10-29 18:23:11 -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 [2143798] Need to figure out how to do video	2009-10-27 13:13:29 -07:00
libs	Another gcc 4.0.3 workaround.	2009-10-29 10:20:44 -07:00
opengl	am 85ade33e: fix [2071412] work around mdp 32-bits fade limitation	2009-10-29 13:43:26 -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