OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 677dc6c e57a236)
am 7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
authorBen Murdoch <benm@google.com>
Wed, 25 Nov 2009 10:43:51 +0000 (02:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Nov 2009 10:43:51 +0000 (02:43 -0800)
commit22396577407a02549d215aa979edcf10510248e3
treef804617464777d57cf68bdd2900ecd5740a8ca7dtree | snapshot
parent677dc6cee812ad0d661e9134414fd1f7e1f71a76commit | diff
parente57a2362fd4116864d65d3b2b0c9b8aff6cde971commit | 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.
frameworks/native
About OSDN
Find Software
Develop Software
Help