diff options
Diffstat (limited to 'chrome/browser/autofill/name_field.cc')
| -rw-r--r-- | chrome/browser/autofill/name_field.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/autofill/name_field.cc b/chrome/browser/autofill/name_field.cc index 1a5f4c3..8a83ff7 100644 --- a/chrome/browser/autofill/name_field.cc +++ b/chrome/browser/autofill/name_field.cc @@ -4,13 +4,7 @@ #include "chrome/browser/autofill/name_field.h" -<<<<<<< HEAD -#ifdef ANDROID #include "app/l10n_util.h" -#endif -======= -#include "app/l10n_util.h" ->>>>>>> chromium.org at r10.0.634.0 #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" |