commit 2528705bf57e1e2d784ef55b4334b1d14b333ca4
author Ben Murdoch <benm@google.com> Wed Nov 25 02:54:32 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 25 02:54:32 2009 -0800
tree 4395acfb6835ba79adda49c6969fdc5432fcccb7
parent 50945410bf79e076b323b5c6360fa73e26497e72
parent 08878156e6239cf1dd03bfbd4a108bcefad16b17

am 08878156: (-s ours) am a2d259aa: am 7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair

Merge commit '08878156e6239cf1dd03bfbd4a108bcefad16b17'

* commit '08878156e6239cf1dd03bfbd4a108bcefad16b17':
  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.