diff options
| author | Ben Murdoch <benm@google.com> | 2009-11-25 02:48:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-25 02:48:52 -0800 |
| commit | 08878156e6239cf1dd03bfbd4a108bcefad16b17 (patch) | |
| tree | 118493bdaad588dd1c38cdfc6382344344517537 /opengl/java/android/opengl/Texture.java | |
| parent | 1ffa3c01a90f7e85aacb77163464b689d68f44cd (diff) | |
| parent | a2d259aa4a06eb92af2ef4530ae065497a581496 (diff) | |
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.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions