diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-03 10:56:12 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-02-03 11:00:00 +0000 |
| commit | ecbfb2104f61f0a364a29b431abe6ec645ea6d51 (patch) | |
| tree | 1bd55daf010eb676d77e014b7ede5355366566a7 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 9ecd9437ed57bedfa2a7626430be03f4924f6b42 (diff) | |
Revert "am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit". The corresponding change to external/webkit creates a merge conflict in master.
Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve
the conflict in external/webkit in master directly.
This reverts commit 9ecd9437ed57bedfa2a7626430be03f4924f6b42, reversing
changes made to 019fe73ddbf52edd1819e1d85a0b242ebccc7fc3.
Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions