OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a3162a 2239657)
am a2d259aa: am 7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into...
authorBen Murdoch <benm@google.com>
Wed, 25 Nov 2009 10:48:52 +0000 (02:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Nov 2009 10:48:52 +0000 (02:48 -0800)
commit60f66f40b209c8d15cd9ec027d0b24649753c390
treed5536b408f29d3144d635d9747d2fe88a061731btree | snapshot
parent5a3162ab80873476b63d1fcfe7288916995e6386commit | diff
parent22396577407a02549d215aa979edcf10510248e3commit | 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.
frameworks/native
About OSDN
Find Software
Develop Software
Help