Merge branch 'trunk' of http://git.chromium.org/git/chromium into autofill

chrome/browser/autofill/autofill_external_delegate_android.cc

Index: chrome/browser/autofill/autofill_external_delegate_android.cc
diff --git a/chrome/browser/autofill/autofill_external_delegate_android.cc b/chrome/browser/autofill/autofill_external_delegate_android.cc
deleted file mode 100644
index 5e583afaab60a9c7f89f10e0dd2a67969c943dbb..0000000000000000000000000000000000000000
--- a/chrome/browser/autofill/autofill_external_delegate_android.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/autofill/autofill_external_delegate.h"
-
-#include "chrome/browser/autofill/autofill_manager.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
-
-AutofillExternalDelegate* AutofillExternalDelegate::Create(
-    TabContents* tab_contents,
-    AutofillManager* manager) {
-  NOTIMPLEMENTED() << "TODO(jrg): Upstream AutofillExternalDelegateAndroid";
-  return NULL;
-}