OSDN Git Service

am da8d42de: am 80e68b43: Break the WebCore -> WebKit dependency in ResourceHandleAnd...
authorAndrei Popescu <andreip@google.com>
Fri, 11 Dec 2009 18:47:01 +0000 (10:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 18:47:01 +0000 (10:47 -0800)
commit6c1ab79a0761b5ce13203e022681922d8af318dc
tree040f259cfeb66c569ea36b917289c3a1d0f58ae2
parentbefda4e322bbe91cbd317c9e5a3a7959e814ff40
parentda8d42def98a28bfef84ce5809d13ae1710a342c
am da8d42de: am 80e68b43: Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.

Merge commit 'da8d42def98a28bfef84ce5809d13ae1710a342c'

* commit 'da8d42def98a28bfef84ce5809d13ae1710a342c':
  Break the WebCore -> WebKit dependency in ResourceHandleAndroid.cpp.
WebKit/Android.mk
WebKit/android/jni/WebCoreFrameBridge.cpp