OSDN Git Service

Merge changes I899af0a4,I1d8b554a,Iefb91f0b
authorKristian Monsen <kristianm@google.com>
Fri, 1 Jul 2011 15:04:15 +0000 (08:04 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 1 Jul 2011 15:04:15 +0000 (08:04 -0700)
commita5b33abca20f49b6afd5874d1d2b07f6c37c22a5
tree8a187a5f5fd89a8eb7c326a5e2a96a01f47b804f
parentbeb5d5b7abfe05ecd6dccd281a0885e7a9526286
parent24111c7f4d848be14284815bb6c9a2218740a263
Merge changes I899af0a4,I1d8b554a,Iefb91f0b

* changes:
  Merge Chromium at r11.0.696.0: Compile fix, update include location
  Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.cc
  Merge Chromium at r11.0.696.0: Just AutoFill => Autofill renaming