diff options
| author | Ben Murdoch <benm@google.com> | 2009-11-25 02:43:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-25 02:43:51 -0800 |
| commit | a2d259aa4a06eb92af2ef4530ae065497a581496 (patch) | |
| tree | 3032c37cc84b7b7ac5b74d9ac05bd25db6b3bb37 /opengl/java/android/opengl/Texture.java | |
| parent | ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16 (diff) | |
| parent | 7f7c16dee2f825f37aec4d457bdf5ec9b8109a47 (diff) | |
am 7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-mr2
* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
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.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions