OSDN Git Service

am 0ddb5835: Merge change Ia17a9f02 into eclair-mr2
authorSteve Block <steveblock@google.com>
Thu, 29 Oct 2009 06:43:05 +0000 (23:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Oct 2009 06:43:05 +0000 (23:43 -0700)
commit9f8b0fd09d1f2d5aac7c2657feefc72154a484a1
treed547416005abf90bdf01c86b50768c9fd9b77112
parentcd93e7adfe2e695464f532882ba4c7ee495899d4
parent0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1
am 0ddb5835: Merge change Ia17a9f02 into eclair-mr2

Merge commit '0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1'

* commit '0ddb5835faa6cd39067b2a777ea9123a7f0a6ab1':
  Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs.
WebKit/android/jni/WebCoreFrameBridge.cpp