Ben Murdoch 60f66f40b2 am a2d259aa: am 7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair ... Merge commit 'a2d259aa4a06eb92af2ef4530ae065497a581496' into eclair-mr2-plus-aosp * commit 'a2d259aa4a06eb92af2ef4530ae065497a581496': Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge. Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge. Improves documentation for GeolocationPermissions class. Do not merge.		2009-11-25 02:48:52 -08:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Fix potential deadlock in stopPreview/stopRecord.	2009-11-10 17:08:08 -08:00
cmds	keystore: remove old implementation and test.	2009-09-24 13:35:26 +08:00
common	Add OperationScheduler (and test) to the common static library;	2009-11-21 10:09:46 -08:00
include	fix some aspects of [2258746] native crash in launcher2	2009-11-13 15:26:29 -08:00
libs	When using MDP, we needed to use a texture for diming.	2009-11-23 22:41:36 -08:00
opengl	am b439f561: am 13feccf5: Merge change I39f0003e into eclair	2009-11-19 19:12:01 -08:00
vpn/java/android/net/vpn	Remove deprecated VpnType.getDescription().	2009-09-30 18:39:48 +08:00
cleanspec.mk	Rename [I]DropBox[Service] to [I]DropBoxManager[Service].	2009-11-12 13:58:27 -08:00
MODULE_LICENSE_APACHE2
NOTICE