OSDN Git Service

am 90fe16ce: am d262e1f9: Rework CL, https://android-git.corp.google.com/g/#change...
authorGrace Kloba <klobag@google.com>
Fri, 4 Dec 2009 12:29:01 +0000 (04:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 12:29:01 +0000 (04:29 -0800)
commit9e881a4ed91921665fc9137fc408ca19eb5d0d0e
treeb0bc6b65d19f180077d664b09e830314985034ea
parentb4ca5172f46a25fb7340259ef276406832da5efb
parent90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12
am 90fe16ce: am d262e1f9: Rework CL, https://android-git.corp.google.com/g/#change,34511 due to the history unfork change.

Merge commit '90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12'

* commit '90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12':
  Rework CL, https://android-git.corp.google.com/g/#change,34511
WebKit/android/jni/WebHistory.cpp
WebKit/android/jni/WebHistory.h