OSDN Git Service

am 229c8c38: (-s ours) am 3f2f7e2f: Cherry-pick security fix in WebKit change 65090
authorSteve Block <steveblock@google.com>
Fri, 10 Sep 2010 11:54:59 +0000 (04:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Sep 2010 11:54:59 +0000 (04:54 -0700)
Merge commit '229c8c38532f7fb3da4cb45a4d18f559613af829'

* commit '229c8c38532f7fb3da4cb45a4d18f559613af829':
  Cherry-pick security fix in WebKit change 65090


Trivial merge