OSDN Git Service

am 122a6b03: (-s ours) am 910dc2ab: Cherry-pick WebKit security fix (webkit.org r6947...
authorBen Murdoch <benm@google.com>
Thu, 21 Oct 2010 22:30:54 +0000 (15:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Oct 2010 22:30:54 +0000 (15:30 -0700)
commitaa7cd7683df083936c92a56730fc1ee8f49c18ac
treecee87194b33b697eb0fce452c06c83ac3e21cfb6
parentb33a73f9d6b8db448c6b3bbdbd93bb00ba6a57fd
parent122a6b03f21c5ec726d905d08531bdb8f1c7a376
am 122a6b03: (-s ours) am 910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge

Merge commit '122a6b03f21c5ec726d905d08531bdb8f1c7a376'

* commit '122a6b03f21c5ec726d905d08531bdb8f1c7a376':
  Cherry-pick WebKit security fix (webkit.org r69476) Do not merge