commit 08878156e6239cf1dd03bfbd4a108bcefad16b17
author Ben Murdoch <benm@google.com> Wed Nov 25 02:48:52 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 25 02:48:52 2009 -0800
tree 118493bdaad588dd1c38cdfc6382344344517537
parent 1ffa3c01a90f7e85aacb77163464b689d68f44cd
parent a2d259aa4a06eb92af2ef4530ae065497a581496

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.