OSDN Git Service

am 4ee2e705: am 4f016e5e: Fix the build due to auto merge
authorGrace Kloba <klobag@google.com>
Fri, 4 Dec 2009 12:28:52 +0000 (04:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 12:28:52 +0000 (04:28 -0800)
Merge commit '4ee2e705696ac652df49d552efbe58c92c031e47'

* commit '4ee2e705696ac652df49d552efbe58c92c031e47':
  Fix the build due to auto merge

1  2 
WebKit/android/jni/WebHistory.cpp

Simple merge